Merge pull request #128 from andrewdwallo/development-3.x

Development 3.x

app/Casts/TransactionAmountCast.php

@@ -11,12 +11,42 @@ use UnexpectedValueException;
 
 class TransactionAmountCast implements CastsAttributes
 {
-    private array $currencyCache = [];
+    /**
+     * Static cache to persist across instances
+     */
+    private static array $currencyCache = [];
+
+    /**
+     * Eagerly load all required bank accounts at once if needed
+     */
+    private function loadMissingBankAccounts(array $ids): void
+    {
+        $missingIds = array_filter($ids, static fn ($id) => ! isset(self::$currencyCache[$id]) && $id !== null);
+
+        if (empty($missingIds)) {
+            return;
+        }
+
+        /** @var BankAccount[] $accounts */
+        $accounts = BankAccount::with('account')
+            ->whereIn('id', $missingIds)
+            ->get();
+
+        foreach ($accounts as $account) {
+            self::$currencyCache[$account->id] = $account->account->currency_code ?? CurrencyAccessor::getDefaultCurrency();
+        }
+    }
 
     public function get(Model $model, string $key, mixed $value, array $attributes): string
     {
         // Attempt to retrieve the currency code from the related bankAccount->account model
-        $currencyCode = $this->getCurrencyCodeFromBankAccountId($attributes['bank_account_id'] ?? null);
+        $bankAccountId = $attributes['bank_account_id'] ?? null;
+
+        if ($bankAccountId !== null && ! isset(self::$currencyCache[$bankAccountId])) {
+            $this->loadMissingBankAccounts([$bankAccountId]);
+        }
+
+        $currencyCode = $this->getCurrencyCodeFromBankAccountId($bankAccountId);
 
         if ($value !== null) {
             return CurrencyConverter::prepareForMutator($value, $currencyCode);
@@ -30,7 +60,13 @@ class TransactionAmountCast implements CastsAttributes
      */
     public function set(Model $model, string $key, mixed $value, array $attributes): int
     {
-        $currencyCode = $this->getCurrencyCodeFromBankAccountId($attributes['bank_account_id'] ?? null);
+        $bankAccountId = $attributes['bank_account_id'] ?? null;
+
+        if ($bankAccountId !== null && ! isset(self::$currencyCache[$bankAccountId])) {
+            $this->loadMissingBankAccounts([$bankAccountId]);
+        }
+
+        $currencyCode = $this->getCurrencyCodeFromBankAccountId($bankAccountId);
 
         if (is_numeric($value)) {
             $value = (string) $value;
@@ -42,8 +78,7 @@ class TransactionAmountCast implements CastsAttributes
     }
 
     /**
-     * Using this is necessary because the relationship is not always loaded into memory when the cast is called
-     * Instead of using: $model->bankAccount->account->currency_code directly, find the bank account and get the currency code
+     * Get currency code from the cache or use default
      */
     private function getCurrencyCodeFromBankAccountId(?int $bankAccountId): string
     {
@@ -51,15 +86,6 @@ class TransactionAmountCast implements CastsAttributes
             return CurrencyAccessor::getDefaultCurrency();
         }
 
-        if (isset($this->currencyCache[$bankAccountId])) {
-            return $this->currencyCache[$bankAccountId];
-        }
-
-        $bankAccount = BankAccount::find($bankAccountId);
-
-        $currencyCode = $bankAccount?->account?->currency_code ?? CurrencyAccessor::getDefaultCurrency();
-        $this->currencyCache[$bankAccountId] = $currencyCode;
-
-        return $currencyCode;
+        return self::$currencyCache[$bankAccountId] ?? CurrencyAccessor::getDefaultCurrency();
     }
 }

app/Concerns/RedirectToViewPage.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Concerns;
+
+trait RedirectToViewPage
+{
+    protected function getRedirectUrl(): string
+    {
+        return $this->getResource()::getUrl('view', ['record' => $this->record]);
+    }
+}

app/Enums/Accounting/AdjustmentStatus.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Enums\Accounting;
+
+use Filament\Support\Contracts\HasColor;
+use Filament\Support\Contracts\HasLabel;
+
+enum AdjustmentStatus: string implements HasColor, HasLabel
+{
+    case Active = 'active';
+    case Upcoming = 'upcoming';
+    case Expired = 'expired';
+    case Paused = 'paused';
+    case Archived = 'archived';
+
+    public function getLabel(): ?string
+    {
+        return $this->name;
+    }
+
+    public function getColor(): string | array | null
+    {
+        return match ($this) {
+            self::Active => 'primary',
+            self::Upcoming, self::Paused => 'warning',
+            self::Expired => 'danger',
+            self::Archived => 'gray',
+        };
+    }
+
+    /**
+     * Check if the status is set manually (not calculated from dates)
+     */
+    public function isManualStatus(): bool
+    {
+        return in_array($this, [self::Paused, self::Archived]);
+    }
+
+    /**
+     * Check if the status is system-calculated based on dates
+     */
+    public function isSystemStatus(): bool
+    {
+        return in_array($this, [self::Active, self::Upcoming, self::Expired]);
+    }
+}

app/Enums/Accounting/BudgetIntervalType.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Enums\Accounting;
+
+use App\Enums\Concerns\ParsesEnum;
+use Filament\Support\Contracts\HasLabel;
+
+enum BudgetIntervalType: string implements HasLabel
+{
+    use ParsesEnum;
+
+    case Month = 'month';
+    case Quarter = 'quarter';
+    case Year = 'year';
+
+    public function getLabel(): ?string
+    {
+        return match ($this) {
+            self::Month => 'Monthly',
+            self::Quarter => 'Quarterly',
+            self::Year => 'Yearly',
+        };
+    }
+
+    public function isMonth(): bool
+    {
+        return $this === self::Month;
+    }
+
+    public function isQuarter(): bool
+    {
+        return $this === self::Quarter;
+    }
+
+    public function isYear(): bool
+    {
+        return $this === self::Year;
+    }
+}

app/Enums/Accounting/BudgetSourceType.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Enums\Accounting;
+
+use App\Enums\Concerns\ParsesEnum;
+use Filament\Support\Contracts\HasLabel;
+
+enum BudgetSourceType: string implements HasLabel
+{
+    use ParsesEnum;
+
+    case Budget = 'budget';
+    case Actuals = 'actuals';
+
+    public function getLabel(): string
+    {
+        return match ($this) {
+            self::Budget => 'Copy from a previous budget',
+            self::Actuals => 'Use historical actuals',
+        };
+    }
+
+    public function isBudget(): bool
+    {
+        return $this === self::Budget;
+    }
+
+    public function isActuals(): bool
+    {
+        return $this === self::Actuals;
+    }
+}

app/Enums/Accounting/BudgetStatus.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Enums\Accounting;
+
+use Filament\Support\Contracts\HasColor;
+use Filament\Support\Contracts\HasLabel;
+
+enum BudgetStatus: string implements HasColor, HasLabel
+{
+    case Draft = 'draft';
+    case Active = 'active';
+    case Closed = 'closed';
+
+    public function getLabel(): ?string
+    {
+        return $this->name;
+    }
+
+    public function getColor(): string | array | null
+    {
+        return match ($this) {
+            self::Draft => 'gray',
+            self::Active => 'success',
+            self::Closed => 'warning',
+        };
+    }
+
+    public function isEditable(): bool
+    {
+        return in_array($this, [self::Draft, self::Active]);
+    }
+
+    public static function editableStatuses(): array
+    {
+        return [self::Draft, self::Active];
+    }
+}

app/Filament/Company/Clusters/Settings/Pages/CompanyDefault.php

@@ -65,7 +65,7 @@ class CompanyDefault extends Page
     public function mount(): void
     {
         $this->record = CompanyDefaultModel::firstOrNew([
-            'company_id' => auth()->user()->currentCompany->id,
+            'company_id' => auth()->user()->current_company_id,
         ]);
 
         abort_unless(static::canView($this->record), 404);

app/Filament/Company/Clusters/Settings/Pages/CompanyProfile.php

@@ -68,7 +68,7 @@ class CompanyProfile extends Page
     public function mount(): void
     {
         $this->record = CompanyProfileModel::firstOrNew([
-            'company_id' => auth()->user()->currentCompany->id,
+            'company_id' => auth()->user()->current_company_id,
         ]);
 
         abort_unless(static::canView($this->record), 404);

app/Filament/Company/Clusters/Settings/Pages/Localization.php

@@ -69,7 +69,7 @@ class Localization extends Page
     public function mount(): void
     {
         $this->record = LocalizationModel::firstOrNew([
-            'company_id' => auth()->user()->currentCompany->id,
+            'company_id' => auth()->user()->current_company_id,
         ]);
 
         abort_unless(static::canView($this->record), 404);

app/Filament/Company/Clusters/Settings/Resources/AdjustmentResource.php

@@ -5,16 +5,20 @@ namespace App\Filament\Company\Clusters\Settings\Resources;
 use App\Enums\Accounting\AdjustmentCategory;
 use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Accounting\AdjustmentScope;
+use App\Enums\Accounting\AdjustmentStatus;
 use App\Enums\Accounting\AdjustmentType;
 use App\Filament\Company\Clusters\Settings;
 use App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource\Pages;
 use App\Models\Accounting\Adjustment;
 use Filament\Forms;
 use Filament\Forms\Form;
+use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
 use Filament\Tables;
+use Filament\Tables\Filters\Indicator;
 use Filament\Tables\Table;
-use Wallo\FilamentSelectify\Components\ToggleButton;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
 
 class AdjustmentResource extends Resource
 {
@@ -33,8 +37,7 @@ class AdjustmentResource extends Resource
                             ->required()
                             ->maxLength(255),
                         Forms\Components\Textarea::make('description')
-                            ->label('Description')
-                            ->autosize(),
+                            ->label('Description'),
                     ]),
                 Forms\Components\Section::make('Configuration')
                     ->schema([
@@ -50,9 +53,10 @@ class AdjustmentResource extends Resource
                             ->default(AdjustmentType::Sales)
                             ->live()
                             ->required(),
-                        ToggleButton::make('recoverable')
+                        Forms\Components\Checkbox::make('recoverable')
                             ->label('Recoverable')
                             ->default(false)
+                            ->helperText('When enabled, tax is tracked separately as claimable from the government. Non-recoverable taxes are treated as part of the expense.')
                             ->visible(fn (Forms\Get $get) => AdjustmentCategory::parse($get('category'))->isTax() && AdjustmentType::parse($get('type'))->isPurchase()),
                     ])
                     ->columns()
@@ -77,7 +81,8 @@ class AdjustmentResource extends Resource
                 Forms\Components\Section::make('Dates')
                     ->schema([
                         Forms\Components\DateTimePicker::make('start_date'),
-                        Forms\Components\DateTimePicker::make('end_date'),
+                        Forms\Components\DateTimePicker::make('end_date')
+                            ->after('start_date'),
                     ])
                     ->columns()
                     ->visible(fn (Forms\Get $get) => AdjustmentCategory::parse($get('category'))->isDiscount()),
@@ -91,6 +96,8 @@ class AdjustmentResource extends Resource
                 Tables\Columns\TextColumn::make('name')
                     ->label('Name')
                     ->sortable(),
+                Tables\Columns\TextColumn::make('status')
+                    ->badge(),
                 Tables\Columns\TextColumn::make('category')
                     ->searchable(),
                 Tables\Columns\TextColumn::make('type')
@@ -100,15 +107,250 @@ class AdjustmentResource extends Resource
                     ->rate(static fn (Adjustment $record) => $record->computation->value)
                     ->searchable()
                     ->sortable(),
+                Tables\Columns\TextColumn::make('paused_until')
+                    ->label('Auto-Resume Date')
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+                Tables\Columns\TextColumn::make('start_date')
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+                Tables\Columns\TextColumn::make('end_date')
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
             ])
             ->filters([
-                //
+                Tables\Filters\SelectFilter::make('status')
+                    ->label('Status')
+                    ->native(false)
+                    ->default('unarchived')
+                    ->options(
+                        collect(AdjustmentStatus::cases())
+                            ->mapWithKeys(fn (AdjustmentStatus $status) => [$status->value => $status->getLabel()])
+                            ->merge([
+                                'unarchived' => 'Unarchived',
+                            ])
+                            ->toArray()
+                    )
+                    ->indicateUsing(function (Tables\Filters\SelectFilter $filter, array $state) {
+                        if (blank($state['value'] ?? null)) {
+                            return [];
+                        }
+
+                        $label = collect($filter->getOptions())
+                            ->mapWithKeys(fn (string | array $label, string $value): array => is_array($label) ? $label : [$value => $label])
+                            ->get($state['value']);
+
+                        if (blank($label)) {
+                            return [];
+                        }
+
+                        $indicator = $filter->getIndicator();
+
+                        if (! $indicator instanceof Indicator) {
+                            if ($state['value'] === 'unarchived') {
+                                $indicator = $label;
+                            } else {
+                                $indicator = Indicator::make("{$indicator}: {$label}");
+                            }
+                        }
+
+                        return [$indicator];
+                    })
+                    ->query(function (Builder $query, array $data): Builder {
+                        if (blank($data['value'] ?? null)) {
+                            return $query;
+                        }
+
+                        if ($data['value'] !== 'unarchived') {
+                            return $query->where('status', $data['value']);
+                        } else {
+                            return $query->where('status', '!=', AdjustmentStatus::Archived->value);
+                        }
+                    }),
+                Tables\Filters\SelectFilter::make('category')
+                    ->label('Category')
+                    ->native(false)
+                    ->options(AdjustmentCategory::class),
+                Tables\Filters\SelectFilter::make('type')
+                    ->label('Type')
+                    ->native(false)
+                    ->options(AdjustmentType::class),
+                Tables\Filters\SelectFilter::make('computation')
+                    ->label('Computation')
+                    ->native(false)
+                    ->options(AdjustmentComputation::class),
             ])
             ->actions([
-                Tables\Actions\EditAction::make(),
+                Tables\Actions\ActionGroup::make([
+                    Tables\Actions\EditAction::make(),
+                    Tables\Actions\Action::make('pause')
+                        ->label('Pause')
+                        ->icon('heroicon-m-pause')
+                        ->form([
+                            Forms\Components\DateTimePicker::make('paused_until')
+                                ->label('Auto-resume date')
+                                ->helperText('When should this adjustment automatically resume? Leave empty to keep paused indefinitely.')
+                                ->after('now'),
+                            Forms\Components\Textarea::make('status_reason')
+                                ->label('Reason for pausing')
+                                ->maxLength(255),
+                        ])
+                        ->databaseTransaction()
+                        ->successNotificationTitle('Adjustment paused')
+                        ->failureNotificationTitle('Failed to pause adjustment')
+                        ->visible(fn (Adjustment $record) => $record->canBePaused())
+                        ->action(function (Adjustment $record, array $data, Tables\Actions\Action $action) {
+                            $pausedUntil = $data['paused_until'] ?? null;
+                            $reason = $data['status_reason'] ?? null;
+                            $record->pause($reason, $pausedUntil);
+
+                            $action->success();
+                        }),
+                    Tables\Actions\Action::make('resume')
+                        ->label('Resume')
+                        ->icon('heroicon-m-play')
+                        ->requiresConfirmation()
+                        ->databaseTransaction()
+                        ->successNotificationTitle('Adjustment resumed')
+                        ->failureNotificationTitle('Failed to resume adjustment')
+                        ->visible(fn (Adjustment $record) => $record->canBeResumed())
+                        ->action(function (Adjustment $record, Tables\Actions\Action $action) {
+                            $record->resume();
+
+                            $action->success();
+                        }),
+                    Tables\Actions\Action::make('archive')
+                        ->label('Archive')
+                        ->icon('heroicon-m-archive-box')
+                        ->color('danger')
+                        ->form([
+                            Forms\Components\Textarea::make('status_reason')
+                                ->label('Reason for archiving')
+                                ->maxLength(255),
+                        ])
+                        ->databaseTransaction()
+                        ->successNotificationTitle('Adjustment archived')
+                        ->failureNotificationTitle('Failed to archive adjustment')
+                        ->visible(fn (Adjustment $record) => $record->canBeArchived())
+                        ->action(function (Adjustment $record, array $data, Tables\Actions\Action $action) {
+                            $reason = $data['status_reason'] ?? null;
+                            $record->archive($reason);
+
+                            $action->success();
+                        }),
+                ]),
             ])
             ->bulkActions([
-                //
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\BulkAction::make('pause')
+                        ->label('Pause')
+                        ->icon('heroicon-m-pause')
+                        ->form([
+                            Forms\Components\DateTimePicker::make('paused_until')
+                                ->label('Auto-resume date')
+                                ->helperText('When should these adjustments automatically resume? Leave empty to keep paused indefinitely.')
+                                ->after('now'),
+                            Forms\Components\Textarea::make('status_reason')
+                                ->label('Reason for pausing')
+                                ->maxLength(255),
+                        ])
+                        ->databaseTransaction()
+                        ->successNotificationTitle('Adjustments paused')
+                        ->failureNotificationTitle('Failed to pause adjustments')
+                        ->beforeFormFilled(function (Collection $records, Tables\Actions\BulkAction $action) {
+                            $isInvalid = $records->contains(fn (Adjustment $record) => ! $record->canBePaused());
+
+                            if ($isInvalid) {
+                                Notification::make()
+                                    ->title('Pause failed')
+                                    ->body('Only adjustments that are currently active can be paused. Please adjust your selection and try again.')
+                                    ->persistent()
+                                    ->danger()
+                                    ->send();
+
+                                $action->cancel(true);
+                            }
+                        })
+                        ->deselectRecordsAfterCompletion()
+                        ->action(function (Collection $records, array $data, Tables\Actions\BulkAction $action) {
+                            $pausedUntil = $data['paused_until'] ?? null;
+                            $reason = $data['status_reason'] ?? null;
+
+                            $records->each(function (Adjustment $record) use ($reason, $pausedUntil) {
+                                $record->pause($reason, $pausedUntil);
+                            });
+
+                            $action->success();
+                        }),
+                    Tables\Actions\BulkAction::make('resume')
+                        ->label('Resume')
+                        ->icon('heroicon-m-play')
+                        ->databaseTransaction()
+                        ->requiresConfirmation()
+                        ->successNotificationTitle('Adjustments resumed')
+                        ->failureNotificationTitle('Failed to resume adjustments')
+                        ->before(function (Collection $records, Tables\Actions\BulkAction $action) {
+                            $isInvalid = $records->contains(fn (Adjustment $record) => ! $record->canBeResumed());
+
+                            if ($isInvalid) {
+                                Notification::make()
+                                    ->title('Resume failed')
+                                    ->body('Only adjustments that are currently paused can be resumed. Please adjust your selection and try again.')
+                                    ->persistent()
+                                    ->danger()
+                                    ->send();
+
+                                $action->cancel(true);
+                            }
+                        })
+                        ->deselectRecordsAfterCompletion()
+                        ->action(function (Collection $records, Tables\Actions\BulkAction $action) {
+                            $records->each(function (Adjustment $record) {
+                                $record->resume();
+                            });
+
+                            $action->success();
+                        }),
+                    Tables\Actions\BulkAction::make('archive')
+                        ->label('Archive')
+                        ->icon('heroicon-m-archive-box')
+                        ->color('danger')
+                        ->form([
+                            Forms\Components\Textarea::make('status_reason')
+                                ->label('Reason for archiving')
+                                ->maxLength(255),
+                        ])
+                        ->databaseTransaction()
+                        ->successNotificationTitle('Adjustments archived')
+                        ->failureNotificationTitle('Failed to archive adjustments')
+                        ->beforeFormFilled(function (Collection $records, Tables\Actions\BulkAction $action) {
+                            $isInvalid = $records->contains(fn (Adjustment $record) => ! $record->canBeArchived());
+
+                            if ($isInvalid) {
+                                Notification::make()
+                                    ->title('Archive failed')
+                                    ->body('Only adjustments that are currently active or paused can be archived. Please adjust your selection and try again.')
+                                    ->persistent()
+                                    ->danger()
+                                    ->send();
+
+                                $action->cancel(true);
+                            }
+                        })
+                        ->deselectRecordsAfterCompletion()
+                        ->action(function (Collection $records, array $data, Tables\Actions\BulkAction $action) {
+                            $reason = $data['status_reason'] ?? null;
+
+                            $records->each(function (Adjustment $record) use ($reason) {
+                                $record->archive($reason);
+                            });
+
+                            $action->success();
+                        }),
+                ]),
             ]);
     }
 

app/Filament/Company/Clusters/Settings/Resources/AdjustmentResource/Pages/CreateAdjustment.php

@@ -2,10 +2,13 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource\Pages;
 
+use App\Concerns\RedirectToListPage;
 use App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateAdjustment extends CreateRecord
 {
+    use RedirectToListPage;
+
     protected static string $resource = AdjustmentResource::class;
 }

app/Filament/Company/Clusters/Settings/Resources/AdjustmentResource/Pages/EditAdjustment.php

@@ -2,11 +2,14 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource\Pages;
 
+use App\Concerns\RedirectToListPage;
 use App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource;
 use Filament\Resources\Pages\EditRecord;
 
 class EditAdjustment extends EditRecord
 {
+    use RedirectToListPage;
+
     protected static string $resource = AdjustmentResource::class;
 
     protected function getHeaderActions(): array

app/Filament/Company/Clusters/Settings/Resources/DocumentDefaultResource/Pages/EditDocumentDefault.php

@@ -2,12 +2,15 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\DocumentDefaultResource\Pages;
 
+use App\Concerns\RedirectToListPage;
 use App\Filament\Company\Clusters\Settings\Resources\DocumentDefaultResource;
 use Filament\Resources\Pages\EditRecord;
 use Illuminate\Contracts\Support\Htmlable;
 
 class EditDocumentDefault extends EditRecord
 {
+    use RedirectToListPage;
+
     protected static string $resource = DocumentDefaultResource::class;
 
     public function getRecordTitle(): string | Htmlable

app/Filament/Company/Pages/Accounting/AccountChart.php

@@ -3,15 +3,17 @@
 namespace App\Filament\Company\Pages\Accounting;
 
 use App\Enums\Accounting\AccountCategory;
+use App\Enums\Banking\BankAccountType;
+use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\AccountSubtype;
 use App\Utilities\Accounting\AccountCode;
-use App\Utilities\Currency\CurrencyAccessor;
 use Filament\Actions\Action;
 use Filament\Actions\CreateAction;
 use Filament\Actions\EditAction;
 use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Component;
+use Filament\Forms\Components\Group;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
@@ -21,6 +23,8 @@ use Filament\Forms\Set;
 use Filament\Pages\Page;
 use Filament\Support\Enums\MaxWidth;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\Rules\Unique;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Url;
 
@@ -39,6 +43,7 @@ class AccountChart extends Page
     {
         $action
             ->modal()
+            ->slideOver()
             ->modalWidth(MaxWidth::TwoExtraLarge);
     }
 
@@ -46,8 +51,9 @@ class AccountChart extends Page
     public function categories(): Collection
     {
         return AccountSubtype::withCount('accounts')
-            ->with('accounts')
-            ->with('accounts.adjustment')
+            ->with(['accounts' => function ($query) {
+                $query->withLastTransactionDate()->with('adjustment');
+            }])
             ->get()
             ->groupBy('category');
     }
@@ -94,6 +100,7 @@ class AccountChart extends Page
                 $this->getTypeFormComponent($useActiveTab),
                 $this->getCodeFormComponent(),
                 $this->getNameFormComponent(),
+                ...$this->getBankAccountFormComponents(),
                 $this->getCurrencyFormComponent(),
                 $this->getDescriptionFormComponent(),
                 $this->getArchiveFormComponent(),
@@ -106,15 +113,18 @@ class AccountChart extends Page
             ->label('Type')
             ->required()
             ->live()
-            ->disabled(static function (string $operation): bool {
-                return $operation === 'edit';
-            })
+            ->disabledOn('edit')
+            ->searchable()
             ->options($this->getChartSubtypeOptions($useActiveTab))
             ->afterStateUpdated(static function (?string $state, Set $set): void {
                 if ($state) {
                     $accountSubtype = AccountSubtype::find($state);
                     $generatedCode = AccountCode::generate($accountSubtype);
                     $set('code', $generatedCode);
+
+                    $set('is_bank_account', false);
+                    $set('bankAccount.type', null);
+                    $set('bankAccount.number', null);
                 }
             });
     }
@@ -124,11 +134,124 @@ class AccountChart extends Page
         return TextInput::make('code')
             ->label('Code')
             ->required()
+            ->hiddenOn('edit')
             ->validationAttribute('account code')
             ->unique(table: Account::class, column: 'code', ignoreRecord: true)
             ->validateAccountCode(static fn (Get $get) => $get('subtype_id'));
     }
 
+    protected function getBankAccountFormComponents(): array
+    {
+        return [
+            Checkbox::make('is_bank_account')
+                ->live()
+                ->visible(function (Get $get, string $operation) {
+                    if ($operation === 'edit') {
+                        return false;
+                    }
+
+                    $subtype = $get('subtype_id');
+                    if (empty($subtype)) {
+                        return false;
+                    }
+
+                    $accountSubtype = AccountSubtype::find($subtype);
+
+                    if (! $accountSubtype) {
+                        return false;
+                    }
+
+                    return in_array($accountSubtype->category, [
+                        AccountCategory::Asset,
+                        AccountCategory::Liability,
+                    ]) && $accountSubtype->multi_currency;
+                })
+                ->afterStateUpdated(static function ($state, Get $get, Set $set) {
+                    if ($state) {
+                        $subtypeId = $get('subtype_id');
+
+                        if (empty($subtypeId)) {
+                            return;
+                        }
+
+                        $subtype = AccountSubtype::find($subtypeId);
+
+                        if (! $subtype) {
+                            return;
+                        }
+
+                        // Set default bank account type based on account category
+                        if ($subtype->category === AccountCategory::Asset) {
+                            $set('bankAccount.type', BankAccountType::Depository->value);
+                        } elseif ($subtype->category === AccountCategory::Liability) {
+                            $set('bankAccount.type', BankAccountType::Credit->value);
+                        }
+                    } else {
+                        // Clear bank account fields
+                        $set('bankAccount.type', null);
+                        $set('bankAccount.number', null);
+                    }
+                }),
+            Group::make()
+                ->relationship('bankAccount')
+                ->schema([
+                    Select::make('type')
+                        ->label('Bank account type')
+                        ->options(function (Get $get) {
+                            $subtype = $get('../subtype_id');
+
+                            if (empty($subtype)) {
+                                return [];
+                            }
+
+                            $accountSubtype = AccountSubtype::find($subtype);
+
+                            if (! $accountSubtype) {
+                                return [];
+                            }
+
+                            if ($accountSubtype->category === AccountCategory::Asset) {
+                                return [
+                                    BankAccountType::Depository->value => BankAccountType::Depository->getLabel(),
+                                    BankAccountType::Investment->value => BankAccountType::Investment->getLabel(),
+                                ];
+                            } elseif ($accountSubtype->category === AccountCategory::Liability) {
+                                return [
+                                    BankAccountType::Credit->value => BankAccountType::Credit->getLabel(),
+                                    BankAccountType::Loan->value => BankAccountType::Loan->getLabel(),
+                                ];
+                            }
+
+                            return [];
+                        })
+                        ->searchable()
+                        ->columnSpan(1)
+                        ->disabledOn('edit')
+                        ->required(),
+                    TextInput::make('number')
+                        ->label('Bank account number')
+                        ->unique(ignoreRecord: true, modifyRuleUsing: static function (Unique $rule, $state) {
+                            $companyId = Auth::user()->currentCompany->id;
+
+                            return $rule->where('company_id', $companyId)->where('number', $state);
+                        })
+                        ->maxLength(20)
+                        ->validationAttribute('account number'),
+                ])
+                ->visible(static function (Get $get, ?Account $record, string $operation) {
+                    if ($operation === 'create') {
+                        return (bool) $get('is_bank_account');
+                    }
+
+                    if ($operation === 'edit' && $record) {
+                        return (bool) $record->bankAccount;
+                    }
+
+                    return false;
+                }),
+        ];
+    }
+
     protected function getNameFormComponent(): Component
     {
         return TextInput::make('name')
@@ -136,38 +259,32 @@ class AccountChart extends Page
             ->required();
     }
 
-    protected function getCurrencyFormComponent()
+    protected function getCurrencyFormComponent(): Component
     {
-        return Select::make('currency_code')
-            ->localizeLabel('Currency')
-            ->relationship('currency', 'name')
-            ->default(CurrencyAccessor::getDefaultCurrency())
-            ->preload()
-            ->searchable()
-            ->disabled(static function (string $operation): bool {
-                return $operation === 'edit';
-            })
+        return CreateCurrencySelect::make('currency_code')
+            ->disabledOn('edit')
+            ->required(false)
+            ->requiredIfAccepted('is_bank_account')
+            ->validationMessages([
+                'required_if_accepted' => 'The currency is required for bank accounts.',
+            ])
             ->visible(function (Get $get): bool {
                 return filled($get('subtype_id')) && AccountSubtype::find($get('subtype_id'))->multi_currency;
-            })
-            ->live();
+            });
     }
 
     protected function getDescriptionFormComponent(): Component
     {
         return Textarea::make('description')
-            ->label('Description')
-            ->autosize();
+            ->label('Description');
     }
 
     protected function getArchiveFormComponent(): Component
     {
         return Checkbox::make('archived')
             ->label('Archive account')
-            ->helperText('Archived accounts will not be available for selection in transactions.')
-            ->hidden(static function (string $operation): bool {
-                return $operation === 'create';
-            });
+            ->helperText('Archived accounts will not be available for selection in transactions, offerings, or other new records.')
+            ->hiddenOn('create');
     }
 
     private function getChartSubtypeOptions($useActiveTab = true): array

app/Filament/Company/Pages/Accounting/Transactions.php

@@ -36,7 +36,6 @@ use Filament\Forms\Get;
 use Filament\Forms\Set;
 use Filament\Pages\Page;
 use Filament\Support\Colors\Color;
-use Filament\Support\Enums\Alignment;
 use Filament\Support\Enums\FontWeight;
 use Filament\Support\Enums\IconPosition;
 use Filament\Support\Enums\IconSize;
@@ -111,6 +110,9 @@ class Transactions extends Page implements HasTable
                     ->label('Add journal transaction')
                     ->fillForm(fn (): array => $this->getFormDefaultsForType(TransactionType::Journal))
                     ->modalWidth(MaxWidth::Screen)
+                    ->extraModalWindowAttributes([
+                        'class' => 'journal-transaction-modal',
+                    ])
                     ->model(static::getModel())
                     ->form(fn (Form $form) => $this->journalTransactionForm($form))
                     ->modalSubmitAction(fn (Actions\StaticAction $action) => $action->disabled(! $this->isJournalEntryBalanced()))
@@ -343,34 +345,7 @@ class Transactions extends Page implements HasTable
                 $filters['posted_at'],
                 $filters['updated_at'],
             ])
-            ->deferFilters()
-            ->deferLoading()
             ->filtersFormWidth(MaxWidth::ThreeExtraLarge)
-            ->filtersTriggerAction(
-                fn (Tables\Actions\Action $action) => $action
-                    ->slideOver()
-                    ->modalFooterActionsAlignment(Alignment::End)
-                    ->modalCancelAction(false)
-                    ->extraModalFooterActions(function (Table $table) use ($action) {
-                        return [
-                            $table->getFiltersApplyAction()
-                                ->close(),
-                            Actions\StaticAction::make('cancel')
-                                ->label($action->getModalCancelActionLabel())
-                                ->button()
-                                ->close()
-                                ->color('gray'),
-                            Tables\Actions\Action::make('resetFilters')
-                                ->label(__('Clear all'))
-                                ->color('primary')
-                                ->link()
-                                ->extraAttributes([
-                                    'class' => 'me-auto',
-                                ])
-                                ->action('resetTableFiltersForm'),
-                        ];
-                    })
-            )
             ->actions([
                 Tables\Actions\Action::make('markAsReviewed')
                     ->label('Mark as reviewed')
@@ -623,7 +598,7 @@ class Transactions extends Page implements HasTable
                 ->label('Type')
                 ->options(JournalEntryType::class)
                 ->live()
-                ->afterStateUpdated(function (Get $get, Set $set, ?string $state, ?string $old) {
+                ->afterStateUpdated(function (Get $get, Set $set, $state, $old) {
                     $this->adjustJournalEntryAmountsForTypeChange(JournalEntryType::parse($state), JournalEntryType::parse($old), $get('amount'));
                 })
                 ->softRequired(),

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

@@ -0,0 +1,542 @@
+<?php
+
+namespace App\Filament\Company\Resources\Accounting;
+
+use App\Enums\Accounting\BudgetIntervalType;
+use App\Filament\Company\Resources\Accounting\BudgetResource\Pages;
+use App\Filament\Forms\Components\CustomSection;
+use App\Filament\Forms\Components\CustomTableRepeater;
+use App\Models\Accounting\Account;
+use App\Models\Accounting\Budget;
+use App\Models\Accounting\BudgetAllocation;
+use App\Models\Accounting\BudgetItem;
+use App\Utilities\Currency\CurrencyConverter;
+use Awcodes\TableRepeater\Header;
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\Resource;
+use Filament\Support\Enums\Alignment;
+use Filament\Support\Enums\MaxWidth;
+use Filament\Support\RawJs;
+use Filament\Tables;
+use Filament\Tables\Table;
+use Illuminate\Support\Carbon;
+
+class BudgetResource extends Resource
+{
+    protected static ?string $model = Budget::class;
+
+    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
+
+    protected static ?string $recordTitleAttribute = 'name';
+
+    protected static bool $isGloballySearchable = false;
+
+    public static function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\Section::make('Budget Details')
+                    ->columns()
+                    ->schema([
+                        Forms\Components\TextInput::make('name')
+                            ->required()
+                            ->maxLength(255),
+                        Forms\Components\Select::make('interval_type')
+                            ->label('Budget Interval')
+                            ->options(BudgetIntervalType::class)
+                            ->default(BudgetIntervalType::Month->value)
+                            ->required()
+                            ->live(),
+                        Forms\Components\DatePicker::make('start_date')
+                            ->required()
+                            ->default(now()->startOfYear())
+                            ->live(),
+                        Forms\Components\DatePicker::make('end_date')
+                            ->required()
+                            ->default(now()->endOfYear())
+                            ->live()
+                            ->disabled(static fn (Forms\Get $get) => blank($get('start_date')))
+                            ->minDate(fn (Forms\Get $get) => match (BudgetIntervalType::parse($get('interval_type'))) {
+                                BudgetIntervalType::Month => Carbon::parse($get('start_date'))->addMonth(),
+                                BudgetIntervalType::Quarter => Carbon::parse($get('start_date'))->addQuarter(),
+                                BudgetIntervalType::Year => Carbon::parse($get('start_date'))->addYear(),
+                                default => Carbon::parse($get('start_date'))->addDay(),
+                            })
+                            ->maxDate(fn (Forms\Get $get) => Carbon::parse($get('start_date'))->endOfYear()),
+                        Forms\Components\Textarea::make('notes')
+                            ->columnSpanFull(),
+                    ]),
+
+                //                Forms\Components\Section::make('Budget Items')
+                //                    ->headerActions([
+                //                        Forms\Components\Actions\Action::make('addAccounts')
+                //                            ->label('Add Accounts')
+                //                            ->icon('heroicon-m-plus')
+                //                            ->outlined()
+                //                            ->color('primary')
+                //                            ->form(fn (Forms\Get $get) => [
+                //                                Forms\Components\Select::make('selected_accounts')
+                //                                    ->label('Choose Accounts to Add')
+                //                                    ->options(function () use ($get) {
+                //                                        $existingAccounts = collect($get('budgetItems'))->pluck('account_id')->toArray();
+                //
+                //                                        return Account::query()
+                //                                            ->budgetable()
+                //                                            ->whereNotIn('id', $existingAccounts) // Prevent duplicate selections
+                //                                            ->pluck('name', 'id');
+                //                                    })
+                //                                    ->searchable()
+                //                                    ->multiple()
+                //                                    ->hint('Select the accounts you want to add to this budget'),
+                //                            ])
+                //                            ->action(static fn (Forms\Set $set, Forms\Get $get, array $data) => self::addSelectedAccounts($set, $get, $data)),
+                //
+                //                        Forms\Components\Actions\Action::make('addAllAccounts')
+                //                            ->label('Add All Accounts')
+                //                            ->icon('heroicon-m-folder-plus')
+                //                            ->outlined()
+                //                            ->color('primary')
+                //                            ->action(static fn (Forms\Set $set, Forms\Get $get) => self::addAllAccounts($set, $get))
+                //                            ->hidden(static fn (Forms\Get $get) => filled($get('budgetItems'))),
+                //
+                //                        Forms\Components\Actions\Action::make('increaseAllocations')
+                //                            ->label('Increase Allocations')
+                //                            ->icon('heroicon-m-arrow-up')
+                //                            ->outlined()
+                //                            ->color('success')
+                //                            ->form(fn (Forms\Get $get) => [
+                //                                Forms\Components\Select::make('increase_type')
+                //                                    ->label('Increase Type')
+                //                                    ->options([
+                //                                        'percentage' => 'Percentage (%)',
+                //                                        'fixed' => 'Fixed Amount',
+                //                                    ])
+                //                                    ->default('percentage')
+                //                                    ->live()
+                //                                    ->required(),
+                //
+                //                                Forms\Components\TextInput::make('percentage')
+                //                                    ->label('Increase by %')
+                //                                    ->numeric()
+                //                                    ->suffix('%')
+                //                                    ->required()
+                //                                    ->hidden(fn (Forms\Get $get) => $get('increase_type') !== 'percentage'),
+                //
+                //                                Forms\Components\TextInput::make('fixed_amount')
+                //                                    ->label('Increase by Fixed Amount')
+                //                                    ->numeric()
+                //                                    ->suffix('USD')
+                //                                    ->required()
+                //                                    ->hidden(fn (Forms\Get $get) => $get('increase_type') !== 'fixed'),
+                //
+                //                                Forms\Components\Select::make('apply_to_accounts')
+                //                                    ->label('Apply to Accounts')
+                //                                    ->options(function () use ($get) {
+                //                                        $budgetItems = $get('budgetItems') ?? [];
+                //                                        $accountIds = collect($budgetItems)
+                //                                            ->pluck('account_id')
+                //                                            ->filter()
+                //                                            ->unique()
+                //                                            ->toArray();
+                //
+                //                                        return Account::query()
+                //                                            ->whereIn('id', $accountIds)
+                //                                            ->pluck('name', 'id')
+                //                                            ->toArray();
+                //                                    })
+                //                                    ->searchable()
+                //                                    ->multiple()
+                //                                    ->hint('Leave blank to apply to all accounts'),
+                //
+                //                                Forms\Components\Select::make('apply_to_periods')
+                //                                    ->label('Apply to Periods')
+                //                                    ->options(static function () use ($get) {
+                //                                        $startDate = $get('start_date');
+                //                                        $endDate = $get('end_date');
+                //                                        $intervalType = $get('interval_type');
+                //
+                //                                        if (blank($startDate) || blank($endDate) || blank($intervalType)) {
+                //                                            return [];
+                //                                        }
+                //
+                //                                        $labels = self::generateFormattedLabels($startDate, $endDate, $intervalType);
+                //
+                //                                        return array_combine($labels, $labels);
+                //                                    })
+                //                                    ->searchable()
+                //                                    ->multiple()
+                //                                    ->hint('Leave blank to apply to all periods'),
+                //                            ])
+                //                            ->action(static fn (Forms\Set $set, Forms\Get $get, array $data) => self::increaseAllocations($set, $get, $data))
+                //                            ->visible(static fn (Forms\Get $get) => filled($get('budgetItems'))),
+                //                    ])
+                //                    ->schema([
+                //                        Forms\Components\Repeater::make('budgetItems')
+                //                            ->columns(4)
+                //                            ->hiddenLabel()
+                //                            ->schema([
+                //                                Forms\Components\Select::make('account_id')
+                //                                    ->label('Account')
+                //                                    ->options(Account::query()
+                //                                        ->budgetable()
+                //                                        ->pluck('name', 'id'))
+                //                                    ->searchable()
+                //                                    ->disableOptionsWhenSelectedInSiblingRepeaterItems()
+                //                                    ->columnSpan(1)
+                //                                    ->required(),
+                //
+                //                                Forms\Components\TextInput::make('total_amount')
+                //                                    ->label('Total Amount')
+                //                                    ->numeric()
+                //                                    ->columnSpan(1)
+                //                                    ->suffixAction(
+                //                                        Forms\Components\Actions\Action::make('disperse')
+                //                                            ->label('Disperse')
+                //                                            ->icon('heroicon-m-bars-arrow-down')
+                //                                            ->color('primary')
+                //                                            ->action(static fn (Forms\Set $set, Forms\Get $get, $state) => self::disperseTotalAmount($set, $get, $state))
+                //                                    ),
+                //
+                //                                CustomSection::make('Budget Allocations')
+                //                                    ->contained(false)
+                //                                    ->columns(4)
+                //                                    ->schema(static fn (Forms\Get $get) => self::getAllocationFields($get('../../start_date'), $get('../../end_date'), $get('../../interval_type'))),
+                //                            ])
+                //                            ->defaultItems(0)
+                //                            ->addActionLabel('Add Budget Item'),
+                //                    ]),
+            ]);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\TextColumn::make('name')
+                    ->sortable()
+                    ->searchable(),
+
+                Tables\Columns\TextColumn::make('status')
+                    ->label('Status')
+                    ->sortable()
+                    ->badge(),
+
+                Tables\Columns\TextColumn::make('interval_type')
+                    ->label('Interval')
+                    ->sortable()
+                    ->badge(),
+
+                Tables\Columns\TextColumn::make('start_date')
+                    ->label('Start Date')
+                    ->date()
+                    ->sortable(),
+
+                Tables\Columns\TextColumn::make('end_date')
+                    ->label('End Date')
+                    ->date()
+                    ->sortable(),
+            ])
+            ->filters([
+                //
+            ])
+            ->actions([
+                Tables\Actions\ActionGroup::make([
+                    Tables\Actions\ViewAction::make(),
+                    Tables\Actions\EditAction::make('editAllocations')
+                        ->name('editAllocations')
+                        ->url(null)
+                        ->label('Edit Allocations')
+                        ->icon('heroicon-o-table-cells')
+                        ->modalWidth(MaxWidth::Screen)
+                        ->modalHeading('Edit Budget Allocations')
+                        ->modalDescription('Update the allocations for this budget')
+                        ->slideOver()
+                        ->form(function (Budget $record) {
+                            $periods = $record->getPeriods();
+
+                            $headers = [
+                                Header::make('Account')
+                                    ->label('Account')
+                                    ->width('200px'),
+                                Header::make('total')
+                                    ->label('Total')
+                                    ->width('120px')
+                                    ->align(Alignment::Right),
+                                Header::make('action')
+                                    ->label('')
+                                    ->width('40px')
+                                    ->align(Alignment::Center),
+                            ];
+
+                            foreach ($periods as $period) {
+                                $headers[] = Header::make($period->period)
+                                    ->label($period->period)
+                                    ->width('120px')
+                                    ->align(Alignment::Right);
+                            }
+
+                            return [
+                                CustomTableRepeater::make('budgetItems')
+                                    ->relationship()
+                                    ->hiddenLabel()
+                                    ->headers($headers)
+                                    ->schema([
+                                        Forms\Components\Placeholder::make('account')
+                                            ->hiddenLabel()
+                                            ->content(fn (BudgetItem $record) => $record->account->name ?? ''),
+
+                                        Forms\Components\TextInput::make('total')
+                                            ->hiddenLabel()
+                                            ->mask(RawJs::make('$money($input)'))
+                                            ->stripCharacters(',')
+                                            ->numeric()
+                                            ->afterStateHydrated(function ($component, $state, BudgetItem $record) use ($periods) {
+                                                $total = 0;
+                                                // Calculate the total for this budget item across all periods
+                                                foreach ($periods as $period) {
+                                                    $allocation = $record->allocations->firstWhere('period', $period->period);
+                                                    $total += $allocation ? $allocation->getRawOriginal('amount') : 0;
+                                                }
+                                                $component->state(CurrencyConverter::convertCentsToFormatSimple($total));
+                                            })
+                                            ->dehydrated(false),
+
+                                        Forms\Components\Actions::make([
+                                            Forms\Components\Actions\Action::make('disperse')
+                                                ->label('Disperse')
+                                                ->icon('heroicon-m-chevron-double-right')
+                                                ->color('primary')
+                                                ->iconButton()
+                                                ->action(function (Forms\Set $set, Forms\Get $get, BudgetItem $record, $livewire) use ($periods) {
+                                                    $total = CurrencyConverter::convertToCents($get('total'));
+                                                    $numPeriods = count($periods);
+
+                                                    if ($numPeriods === 0) {
+                                                        return;
+                                                    }
+
+                                                    $baseAmount = floor($total / $numPeriods);
+                                                    $remainder = $total - ($baseAmount * $numPeriods);
+
+                                                    foreach ($periods as $index => $period) {
+                                                        $amount = $baseAmount + ($index === 0 ? $remainder : 0);
+                                                        $formattedAmount = CurrencyConverter::convertCentsToFormatSimple($amount);
+                                                        $set("allocations.{$period->period}", $formattedAmount);
+                                                    }
+                                                }),
+                                        ]),
+
+                                        // Create a field for each period
+                                        ...collect($periods)->map(function (BudgetAllocation $period) {
+                                            return Forms\Components\TextInput::make("allocations.{$period->period}")
+                                                ->mask(RawJs::make('$money($input)'))
+                                                ->stripCharacters(',')
+                                                ->numeric()
+                                                ->afterStateHydrated(function ($component, $state, BudgetItem $record) use ($period) {
+                                                    // Find the allocation for this period
+                                                    $allocation = $record->allocations->firstWhere('period', $period->period);
+                                                    $component->state($allocation ? $allocation->amount : 0);
+                                                })
+                                                ->dehydrated(false); // We'll handle saving manually
+                                        })->toArray(),
+                                    ])
+                                    ->spreadsheet()
+                                    ->itemLabel(fn (BudgetItem $record) => $record->account->name ?? 'Budget Item')
+                                    ->deletable(false)
+                                    ->reorderable(false)
+                                    ->addable(false) // Don't allow adding new budget items
+                                    ->columnSpanFull(),
+                            ];
+                        }),
+                ]),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
+            ]);
+    }
+
+    private static function addAllAccounts(Forms\Set $set, Forms\Get $get): void
+    {
+        $accounts = Account::query()
+            ->budgetable()
+            ->pluck('id');
+
+        $budgetItems = $accounts->map(static fn ($accountId) => [
+            'account_id' => $accountId,
+            'total_amount' => 0, // Default to 0 until the user inputs amounts
+            'amounts' => self::generateDefaultAllocations($get('start_date'), $get('end_date'), $get('interval_type')),
+        ])->toArray();
+
+        $set('budgetItems', $budgetItems);
+    }
+
+    private static function addSelectedAccounts(Forms\Set $set, Forms\Get $get, array $data): void
+    {
+        $selectedAccountIds = $data['selected_accounts'] ?? [];
+
+        if (empty($selectedAccountIds)) {
+            return; // No accounts selected, do nothing.
+        }
+
+        $existingAccountIds = collect($get('budgetItems'))
+            ->pluck('account_id')
+            ->unique()
+            ->filter()
+            ->toArray();
+
+        // Only add accounts that aren't already in the budget items
+        $newAccounts = array_diff($selectedAccountIds, $existingAccountIds);
+
+        $newBudgetItems = collect($newAccounts)->map(static fn ($accountId) => [
+            'account_id' => $accountId,
+            'total_amount' => 0,
+            'amounts' => self::generateDefaultAllocations($get('start_date'), $get('end_date'), $get('interval_type')),
+        ])->toArray();
+
+        // Merge new budget items with existing ones
+        $set('budgetItems', array_merge($get('budgetItems') ?? [], $newBudgetItems));
+    }
+
+    private static function generateDefaultAllocations(?string $startDate, ?string $endDate, ?string $intervalType): array
+    {
+        if (! $startDate || ! $endDate || ! $intervalType) {
+            return [];
+        }
+
+        $labels = self::generateFormattedLabels($startDate, $endDate, $intervalType);
+
+        return collect($labels)->mapWithKeys(static fn ($label) => [$label => 0])->toArray();
+    }
+
+    private static function increaseAllocations(Forms\Set $set, Forms\Get $get, array $data): void
+    {
+        $increaseType = $data['increase_type']; // 'percentage' or 'fixed'
+        $percentage = $data['percentage'] ?? 0;
+        $fixedAmount = $data['fixed_amount'] ?? 0;
+
+        $selectedAccounts = $data['apply_to_accounts'] ?? []; // Selected account IDs
+        $selectedPeriods = $data['apply_to_periods'] ?? []; // Selected period labels
+
+        $budgetItems = $get('budgetItems') ?? [];
+
+        foreach ($budgetItems as $index => $budgetItem) {
+            // Skip if this account isn't selected (unless all accounts are being updated)
+            if (! empty($selectedAccounts) && ! in_array($budgetItem['account_id'], $selectedAccounts)) {
+                continue;
+            }
+
+            if (empty($budgetItem['amounts'])) {
+                continue; // Skip if no allocations exist
+            }
+
+            $updatedAmounts = $budgetItem['amounts']; // Clone existing amounts
+            foreach ($updatedAmounts as $label => $amount) {
+                // Skip if this period isn't selected (unless all periods are being updated)
+                if (! empty($selectedPeriods) && ! in_array($label, $selectedPeriods)) {
+                    continue;
+                }
+
+                // Apply increase based on selected type
+                $updatedAmounts[$label] = match ($increaseType) {
+                    'percentage' => round($amount * (1 + $percentage / 100), 2),
+                    'fixed' => round($amount + $fixedAmount, 2),
+                    default => $amount,
+                };
+            }
+
+            $set("budgetItems.{$index}.amounts", $updatedAmounts);
+            $set("budgetItems.{$index}.total_amount", round(array_sum($updatedAmounts), 2));
+        }
+    }
+
+    private static function disperseTotalAmount(Forms\Set $set, Forms\Get $get, float $totalAmount): void
+    {
+        $startDate = $get('../../start_date');
+        $endDate = $get('../../end_date');
+        $intervalType = $get('../../interval_type');
+
+        if (! $startDate || ! $endDate || ! $intervalType || $totalAmount <= 0) {
+            return;
+        }
+
+        $labels = self::generateFormattedLabels($startDate, $endDate, $intervalType);
+        $numPeriods = count($labels);
+
+        if ($numPeriods === 0) {
+            return;
+        }
+
+        $baseAmount = floor($totalAmount / $numPeriods);
+        $remainder = $totalAmount - ($baseAmount * $numPeriods);
+
+        foreach ($labels as $index => $label) {
+            $amount = $baseAmount + ($index === 0 ? $remainder : 0);
+            $set("amounts.{$label}", $amount);
+        }
+    }
+
+    private static function generateFormattedLabels(string $startDate, string $endDate, string $intervalType): array
+    {
+        $start = Carbon::parse($startDate);
+        $end = Carbon::parse($endDate);
+        $intervalTypeEnum = BudgetIntervalType::parse($intervalType);
+        $labels = [];
+
+        while ($start->lte($end)) {
+            $labels[] = match ($intervalTypeEnum) {
+                BudgetIntervalType::Month => $start->format('M'), // Example: Jan, Feb, Mar
+                BudgetIntervalType::Quarter => 'Q' . $start->quarter, // Example: Q1, Q2, Q3
+                BudgetIntervalType::Year => (string) $start->year, // Example: 2024, 2025
+                default => '',
+            };
+
+            match ($intervalTypeEnum) {
+                BudgetIntervalType::Month => $start->addMonth(),
+                BudgetIntervalType::Quarter => $start->addQuarter(),
+                BudgetIntervalType::Year => $start->addYear(),
+                default => null,
+            };
+        }
+
+        return $labels;
+    }
+
+    private static function getAllocationFields(?string $startDate, ?string $endDate, ?string $intervalType): array
+    {
+        if (! $startDate || ! $endDate || ! $intervalType) {
+            return [];
+        }
+
+        $fields = [];
+
+        $labels = self::generateFormattedLabels($startDate, $endDate, $intervalType);
+
+        foreach ($labels as $label) {
+            $fields[] = Forms\Components\TextInput::make("amounts.{$label}")
+                ->label($label)
+                ->numeric()
+                ->required();
+        }
+
+        return $fields;
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListBudgets::route('/'),
+            'create' => Pages\CreateBudget::route('/create'),
+            'view' => Pages\ViewBudget::route('/{record}'),
+        ];
+    }
+}

app/Filament/Company/Resources/Accounting/BudgetResource/Pages/CreateBudget.php

@@ -0,0 +1,634 @@
+<?php
+
+namespace App\Filament\Company\Resources\Accounting\BudgetResource\Pages;
+
+use App\Enums\Accounting\BudgetIntervalType;
+use App\Enums\Accounting\BudgetSourceType;
+use App\Facades\Accounting;
+use App\Filament\Company\Resources\Accounting\BudgetResource;
+use App\Filament\Forms\Components\CustomSection;
+use App\Models\Accounting\Account;
+use App\Models\Accounting\Budget;
+use App\Models\Accounting\BudgetAllocation;
+use App\Models\Accounting\BudgetItem;
+use App\Utilities\Currency\CurrencyConverter;
+use Filament\Forms;
+use Filament\Forms\Components\Actions\Action;
+use Filament\Forms\Components\Wizard\Step;
+use Filament\Resources\Pages\CreateRecord;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
+
+class CreateBudget extends CreateRecord
+{
+    use CreateRecord\Concerns\HasWizard;
+
+    protected static string $resource = BudgetResource::class;
+
+    // Add computed properties
+    public function getBudgetableAccounts(): Collection
+    {
+        return $this->getAccountsCache('budgetable', function () {
+            return Account::query()->budgetable()->get();
+        });
+    }
+
+    public function getAccountsWithActuals(): Collection
+    {
+        $fiscalYear = $this->data['source_fiscal_year'] ?? null;
+
+        if (blank($fiscalYear)) {
+            return collect();
+        }
+
+        return $this->getAccountsCache("actuals_{$fiscalYear}", function () use ($fiscalYear) {
+            return Account::query()
+                ->budgetable()
+                ->whereHas('journalEntries.transaction', function (Builder $query) use ($fiscalYear) {
+                    $query->whereYear('posted_at', $fiscalYear);
+                })
+                ->get();
+        });
+    }
+
+    public function getAccountsWithoutActuals(): Collection
+    {
+        $fiscalYear = $this->data['source_fiscal_year'] ?? null;
+
+        if (blank($fiscalYear)) {
+            return collect();
+        }
+
+        $budgetableAccounts = $this->getBudgetableAccounts();
+        $accountsWithActuals = $this->getAccountsWithActuals();
+
+        return $budgetableAccounts->whereNotIn('id', $accountsWithActuals->pluck('id'));
+    }
+
+    public function getAccountBalances(): Collection
+    {
+        $fiscalYear = $this->data['source_fiscal_year'] ?? null;
+
+        if (blank($fiscalYear)) {
+            return collect();
+        }
+
+        return $this->getAccountsCache("balances_{$fiscalYear}", function () use ($fiscalYear) {
+            $fiscalYearStart = Carbon::create($fiscalYear, 1, 1)->startOfYear();
+            $fiscalYearEnd = $fiscalYearStart->copy()->endOfYear();
+
+            return Accounting::getAccountBalances(
+                $fiscalYearStart->toDateString(),
+                $fiscalYearEnd->toDateString(),
+                $this->getBudgetableAccounts()->pluck('id')->toArray()
+            )->get();
+        });
+    }
+
+    // Cache helper to avoid duplicate queries
+    private array $accountsCache = [];
+
+    private function getAccountsCache(string $key, callable $callback): Collection
+    {
+        if (! isset($this->accountsCache[$key])) {
+            $this->accountsCache[$key] = $callback();
+        }
+
+        return $this->accountsCache[$key];
+    }
+
+    public function getSteps(): array
+    {
+        return [
+            Step::make('General Information')
+                ->icon('heroicon-o-document-text')
+                ->columns(2)
+                ->schema([
+                    Forms\Components\TextInput::make('name')
+                        ->required()
+                        ->maxLength(255),
+                    Forms\Components\Select::make('interval_type')
+                        ->label('Budget Interval')
+                        ->options(BudgetIntervalType::class)
+                        ->default(BudgetIntervalType::Month->value)
+                        ->required()
+                        ->live(),
+                    Forms\Components\DatePicker::make('start_date')
+                        ->required()
+                        ->default(now()->startOfYear())
+                        ->live(),
+                    Forms\Components\DatePicker::make('end_date')
+                        ->required()
+                        ->default(now()->endOfYear())
+                        ->live()
+                        ->disabled(static fn (Forms\Get $get) => blank($get('start_date')))
+                        ->minDate(fn (Forms\Get $get) => match (BudgetIntervalType::parse($get('interval_type'))) {
+                            BudgetIntervalType::Month => Carbon::parse($get('start_date'))->addMonth(),
+                            BudgetIntervalType::Quarter => Carbon::parse($get('start_date'))->addQuarter(),
+                            BudgetIntervalType::Year => Carbon::parse($get('start_date'))->addYear(),
+                            default => Carbon::parse($get('start_date'))->addDay(),
+                        })
+                        ->maxDate(fn (Forms\Get $get) => Carbon::parse($get('start_date'))->endOfYear()),
+                ]),
+
+            Step::make('Budget Setup & Settings')
+                ->icon('heroicon-o-cog-6-tooth')
+                ->schema([
+                    // Prefill configuration
+                    Forms\Components\Toggle::make('prefill_data')
+                        ->label('Prefill Data')
+                        ->helperText('Enable this option to prefill the budget with historical data')
+                        ->default(false)
+                        ->live(),
+
+                    Forms\Components\Grid::make(1)
+                        ->schema([
+                            Forms\Components\Select::make('source_type')
+                                ->label('Prefill Method')
+                                ->options(BudgetSourceType::class)
+                                ->live()
+                                ->required(),
+
+                            // If user selects to copy a previous budget
+                            Forms\Components\Select::make('source_budget_id')
+                                ->label('Source Budget')
+                                ->options(fn () => Budget::query()
+                                    ->orderByDesc('end_date')
+                                    ->pluck('name', 'id'))
+                                ->searchable()
+                                ->required()
+                                ->visible(fn (Forms\Get $get) => BudgetSourceType::parse($get('source_type'))?->isBudget()),
+
+                            // If user selects to use historical actuals
+                            Forms\Components\Select::make('source_fiscal_year')
+                                ->label('Fiscal Year')
+                                ->options(function () {
+                                    $options = [];
+                                    $company = auth()->user()->currentCompany;
+                                    $earliestDate = Carbon::parse(Accounting::getEarliestTransactionDate());
+                                    $fiscalYearStartCurrent = Carbon::parse($company->locale->fiscalYearStartDate());
+
+                                    for ($year = $fiscalYearStartCurrent->year; $year >= $earliestDate->year; $year--) {
+                                        $options[$year] = $year;
+                                    }
+
+                                    return $options;
+                                })
+                                ->required()
+                                ->live()
+                                ->afterStateUpdated(function (Forms\Set $set) {
+                                    // Clear the cache when the fiscal year changes
+                                    $this->accountsCache = [];
+
+                                    // Get all accounts without actuals
+                                    $accountIdsWithoutActuals = $this->getAccountsWithoutActuals()->pluck('id')->toArray();
+
+                                    // Set exclude_accounts_without_actuals to true by default
+                                    $set('exclude_accounts_without_actuals', true);
+
+                                    // Update the selected_accounts field to exclude accounts without actuals
+                                    $set('selected_accounts', $accountIdsWithoutActuals);
+                                })
+                                ->visible(fn (Forms\Get $get) => BudgetSourceType::parse($get('source_type'))?->isActuals()),
+                        ])->visible(fn (Forms\Get $get) => $get('prefill_data') === true),
+
+                    CustomSection::make('Account Selection')
+                        ->contained(false)
+                        ->schema([
+                            Forms\Components\Checkbox::make('exclude_accounts_without_actuals')
+                                ->label('Exclude all accounts without actuals')
+                                ->helperText(function () {
+                                    $count = $this->getAccountsWithoutActuals()->count();
+
+                                    return "Will exclude {$count} accounts without transaction data in the selected fiscal year";
+                                })
+                                ->default(true)
+                                ->live()
+                                ->afterStateUpdated(function (Forms\Set $set, $state) {
+                                    if ($state) {
+                                        // When checked, select all accounts without actuals
+                                        $accountsWithoutActuals = $this->getAccountsWithoutActuals()->pluck('id')->toArray();
+                                        $set('selected_accounts', $accountsWithoutActuals);
+                                    } else {
+                                        // When unchecked, clear the selection
+                                        $set('selected_accounts', []);
+                                    }
+                                }),
+
+                            Forms\Components\CheckboxList::make('selected_accounts')
+                                ->label('Select Accounts to Exclude')
+                                ->options(function () {
+                                    // Get all budgetable accounts
+                                    return $this->getBudgetableAccounts()->pluck('name', 'id')->toArray();
+                                })
+                                ->descriptions(function (Forms\Components\CheckboxList $component) {
+                                    $fiscalYear = $this->data['source_fiscal_year'] ?? null;
+
+                                    if (blank($fiscalYear)) {
+                                        return [];
+                                    }
+
+                                    $accountIds = array_keys($component->getOptions());
+                                    $descriptions = [];
+
+                                    if (empty($accountIds)) {
+                                        return [];
+                                    }
+
+                                    // Get account balances
+                                    $accountBalances = $this->getAccountBalances()->keyBy('id');
+
+                                    // Get accounts with actuals
+                                    $accountsWithActuals = $this->getAccountsWithActuals()->pluck('id')->toArray();
+
+                                    // Process all accounts
+                                    foreach ($accountIds as $accountId) {
+                                        $balance = $accountBalances[$accountId] ?? null;
+                                        $hasActuals = in_array($accountId, $accountsWithActuals);
+
+                                        if ($balance && $hasActuals) {
+                                            // Calculate net movement
+                                            $netMovement = Accounting::calculateNetMovementByCategory(
+                                                $balance->category,
+                                                $balance->total_debit ?? 0,
+                                                $balance->total_credit ?? 0
+                                            );
+
+                                            // Format the amount for display
+                                            $formattedAmount = CurrencyConverter::formatCentsToMoney($netMovement);
+                                            $descriptions[$accountId] = "{$formattedAmount} in {$fiscalYear}";
+                                        } else {
+                                            $descriptions[$accountId] = "No transactions in {$fiscalYear}";
+                                        }
+                                    }
+
+                                    return $descriptions;
+                                })
+                                ->columns(2) // Display in two columns
+                                ->searchable() // Allow searching for accounts
+                                ->bulkToggleable() // Enable "Select All" / "Deselect All"
+                                ->selectAllAction(fn (Action $action) => $action->label('Exclude all accounts'))
+                                ->deselectAllAction(fn (Action $action) => $action->label('Include all accounts'))
+                                ->afterStateUpdated(function (Forms\Set $set, $state) {
+                                    // Get all accounts without actuals
+                                    $accountsWithoutActuals = $this->getAccountsWithoutActuals()->pluck('id')->toArray();
+
+                                    // Check if all accounts without actuals are in the selected accounts
+                                    $allAccountsWithoutActualsSelected = empty(array_diff($accountsWithoutActuals, $state));
+
+                                    // Update the exclude_accounts_without_actuals checkbox state
+                                    $set('exclude_accounts_without_actuals', $allAccountsWithoutActualsSelected);
+                                }),
+                        ])
+                        ->visible(function (Forms\Get $get) {
+                            // Only show when using actuals with valid fiscal year AND accounts without transactions exist
+                            $prefillSourceType = BudgetSourceType::parse($get('source_type'));
+
+                            if ($prefillSourceType !== BudgetSourceType::Actuals || blank($get('source_fiscal_year'))) {
+                                return false;
+                            }
+
+                            return $this->getAccountsWithoutActuals()->isNotEmpty();
+                        }),
+
+                    Forms\Components\Textarea::make('notes')
+                        ->label('Notes')
+                        ->columnSpanFull(),
+                ]),
+        ];
+    }
+
+    protected function handleRecordCreation(array $data): Model
+    {
+        /** @var Budget $budget */
+        $budget = Budget::create([
+            'source_budget_id' => $data['source_budget_id'] ?? null,
+            'source_fiscal_year' => $data['source_fiscal_year'] ?? null,
+            'source_type' => $data['source_type'] ?? null,
+            'name' => $data['name'],
+            'interval_type' => $data['interval_type'],
+            'start_date' => $data['start_date'],
+            'end_date' => $data['end_date'],
+            'notes' => $data['notes'] ?? null,
+        ]);
+
+        $selectedAccounts = $data['selected_accounts'] ?? [];
+
+        $accountsToInclude = Account::query()
+            ->budgetable()
+            ->whereNotIn('id', $selectedAccounts)
+            ->get();
+
+        foreach ($accountsToInclude as $account) {
+            /** @var BudgetItem $budgetItem */
+            $budgetItem = $budget->budgetItems()->create([
+                'account_id' => $account->id,
+            ]);
+
+            $allocationStart = Carbon::parse($data['start_date']);
+            $budgetEndDate = Carbon::parse($data['end_date']);
+
+            // Determine amounts based on the prefill method
+            $amounts = match ($data['source_type'] ?? null) {
+                'actuals' => $this->getAmountsFromActuals($account, $data['source_fiscal_year'], BudgetIntervalType::parse($data['interval_type'])),
+                'previous_budget' => $this->getAmountsFromPreviousBudget($account, $data['source_budget_id'], BudgetIntervalType::parse($data['interval_type'])),
+                default => $this->generateZeroAmounts($data['start_date'], $data['end_date'], BudgetIntervalType::parse($data['interval_type'])),
+            };
+
+            if (empty($amounts)) {
+                $amounts = $this->generateZeroAmounts(
+                    $data['start_date'],
+                    $data['end_date'],
+                    BudgetIntervalType::parse($data['interval_type'])
+                );
+            }
+
+            foreach ($amounts as $periodLabel => $amount) {
+                if ($allocationStart->gt($budgetEndDate)) {
+                    break;
+                }
+
+                $allocationEnd = self::calculateEndDate($allocationStart, BudgetIntervalType::parse($data['interval_type']));
+
+                if ($allocationEnd->gt($budgetEndDate)) {
+                    $allocationEnd = $budgetEndDate->copy();
+                }
+
+                $budgetItem->allocations()->create([
+                    'period' => $periodLabel,
+                    'interval_type' => $data['interval_type'],
+                    'start_date' => $allocationStart->toDateString(),
+                    'end_date' => $allocationEnd->toDateString(),
+                    'amount' => CurrencyConverter::convertCentsToFloat($amount),
+                ]);
+
+                $allocationStart = $allocationEnd->addDay();
+            }
+        }
+
+        return $budget;
+    }
+
+    private function getAmountsFromActuals(Account $account, int $fiscalYear, BudgetIntervalType $intervalType): array
+    {
+        $amounts = [];
+
+        // Get the start and end date of the budget being created
+        $budgetStartDate = Carbon::parse($this->data['start_date']);
+        $budgetEndDate = Carbon::parse($this->data['end_date']);
+
+        // Map to equivalent dates in the reference fiscal year
+        $referenceStartDate = Carbon::create($fiscalYear, $budgetStartDate->month, $budgetStartDate->day);
+        $referenceEndDate = Carbon::create($fiscalYear, $budgetEndDate->month, $budgetEndDate->day);
+
+        // Handle year boundary case (if budget crosses year boundary)
+        if ($budgetStartDate->month > $budgetEndDate->month ||
+            ($budgetStartDate->month === $budgetEndDate->month && $budgetStartDate->day > $budgetEndDate->day)) {
+            $referenceEndDate->year++;
+        }
+
+        if ($intervalType->isMonth()) {
+            // Process month by month within the reference period
+            $currentDate = $referenceStartDate->copy()->startOfMonth();
+            $lastMonth = $referenceEndDate->copy()->startOfMonth();
+
+            while ($currentDate->lte($lastMonth)) {
+                $periodStart = $currentDate->copy()->startOfMonth();
+                $periodEnd = $currentDate->copy()->endOfMonth();
+                $periodLabel = $this->determinePeriod($periodStart, $intervalType);
+
+                $netMovement = Accounting::getNetMovement(
+                    $account,
+                    $periodStart->toDateString(),
+                    $periodEnd->toDateString()
+                );
+
+                $amounts[$periodLabel] = $netMovement->getAmount();
+
+                $currentDate->addMonth();
+            }
+        } elseif ($intervalType->isQuarter()) {
+            // Process quarter by quarter within the reference period
+            $currentDate = $referenceStartDate->copy()->startOfQuarter();
+            $lastQuarter = $referenceEndDate->copy()->startOfQuarter();
+
+            while ($currentDate->lte($lastQuarter)) {
+                $periodStart = $currentDate->copy()->startOfQuarter();
+                $periodEnd = $currentDate->copy()->endOfQuarter();
+                $periodLabel = $this->determinePeriod($periodStart, $intervalType);
+
+                $netMovement = Accounting::getNetMovement(
+                    $account,
+                    $periodStart->toDateString(),
+                    $periodEnd->toDateString()
+                );
+
+                $amounts[$periodLabel] = $netMovement->getAmount();
+
+                $currentDate->addQuarter();
+            }
+        } else {
+            // For yearly intervals
+            $periodStart = $referenceStartDate->copy()->startOfYear();
+            $periodEnd = $referenceEndDate->copy()->endOfYear();
+            $periodLabel = $this->determinePeriod($periodStart, $intervalType);
+
+            $netMovement = Accounting::getNetMovement(
+                $account,
+                $periodStart->toDateString(),
+                $periodEnd->toDateString()
+            );
+
+            $amounts[$periodLabel] = $netMovement->getAmount();
+        }
+
+        return $amounts;
+    }
+
+    private function distributeAmountAcrossPeriods(int $totalAmountInCents, Carbon $startDate, Carbon $endDate, BudgetIntervalType $intervalType): array
+    {
+        $amounts = [];
+        $periods = [];
+
+        // Generate period labels based on interval type
+        $currentPeriod = $startDate->copy();
+        while ($currentPeriod->lte($endDate)) {
+            $periods[] = $this->determinePeriod($currentPeriod, $intervalType);
+            $currentPeriod->addUnit($intervalType->value);
+        }
+
+        // Evenly distribute total amount across periods
+        $periodCount = count($periods);
+
+        if ($periodCount === 0) {
+            return $amounts;
+        }
+
+        $baseAmount = intdiv($totalAmountInCents, $periodCount); // Floor division to get the base amount in cents
+        $remainder = $totalAmountInCents % $periodCount; // Remaining cents to distribute
+
+        foreach ($periods as $index => $period) {
+            $amounts[$period] = $baseAmount + ($index < $remainder ? 1 : 0); // Distribute remainder cents evenly
+        }
+
+        return $amounts;
+    }
+
+    private function getAmountsFromPreviousBudget(Account $account, int $sourceBudgetId, BudgetIntervalType $intervalType): array
+    {
+        $amounts = [];
+
+        // Get the budget being created start and end dates
+        $newBudgetStartDate = Carbon::parse($this->data['start_date']);
+        $newBudgetEndDate = Carbon::parse($this->data['end_date']);
+
+        // Get source budget's date information
+        $sourceBudget = Budget::findOrFail($sourceBudgetId);
+        $sourceBudgetType = $sourceBudget->interval_type;
+
+        // Retrieve all previous allocations for this account
+        $previousAllocations = BudgetAllocation::query()
+            ->whereHas(
+                'budgetItem',
+                fn ($query) => $query->where('account_id', $account->id)
+                    ->where('budget_id', $sourceBudgetId)
+            )
+            ->orderBy('start_date')
+            ->get();
+
+        if ($previousAllocations->isEmpty()) {
+            return $this->generateZeroAmounts(
+                $this->data['start_date'],
+                $this->data['end_date'],
+                $intervalType
+            );
+        }
+
+        // Map previous budget periods to current budget periods
+        if ($intervalType === $sourceBudgetType) {
+            // Same interval type: direct mapping of equivalent periods
+            foreach ($previousAllocations as $allocation) {
+                $allocationDate = Carbon::parse($allocation->start_date);
+
+                // Create an equivalent date in the new budget's time range
+                $equivalentMonth = $allocationDate->month;
+                $equivalentDay = $allocationDate->day;
+                $equivalentYear = $newBudgetStartDate->year;
+
+                // Adjust year if the budget spans multiple years
+                if ($newBudgetStartDate->month > $newBudgetEndDate->month &&
+                    $equivalentMonth < $newBudgetStartDate->month) {
+                    $equivalentYear++;
+                }
+
+                $equivalentDate = Carbon::create($equivalentYear, $equivalentMonth, $equivalentDay);
+
+                // Only include if the date falls within our new budget period
+                if ($equivalentDate->between($newBudgetStartDate, $newBudgetEndDate)) {
+                    $periodLabel = $this->determinePeriod($equivalentDate, $intervalType);
+                    $amounts[$periodLabel] = $allocation->getRawOriginal('amount');
+                }
+            }
+        } else {
+            // Handle conversion between different interval types
+            $newBudgetPeriods = $this->generateZeroAmounts(
+                $this->data['start_date'],
+                $this->data['end_date'],
+                $intervalType
+            );
+
+            // Fill with zeros initially
+            $amounts = array_fill_keys(array_keys($newBudgetPeriods), 0);
+
+            // Group previous allocations by their date range
+            $allocationsByRange = [];
+            foreach ($previousAllocations as $allocation) {
+                $allocationsByRange[] = [
+                    'start' => Carbon::parse($allocation->start_date),
+                    'end' => Carbon::parse($allocation->end_date),
+                    'amount' => $allocation->getRawOriginal('amount'),
+                ];
+            }
+
+            // Create new allocations based on interval type
+            $currentDate = Carbon::parse($this->data['start_date']);
+            $endDate = Carbon::parse($this->data['end_date']);
+
+            while ($currentDate->lte($endDate)) {
+                $periodStart = $currentDate->copy();
+                $periodEnd = self::calculateEndDate($currentDate, $intervalType);
+
+                if ($periodEnd->gt($endDate)) {
+                    $periodEnd = $endDate->copy();
+                }
+
+                $periodLabel = $this->determinePeriod($periodStart, $intervalType);
+
+                // Calculate the proportional amount from the source budget
+                $weightedAmount = 0;
+
+                foreach ($allocationsByRange as $allocation) {
+                    // Find overlapping days between new period and source allocation
+                    $overlapStart = max($periodStart, $allocation['start']);
+                    $overlapEnd = min($periodEnd, $allocation['end']);
+
+                    if ($overlapStart <= $overlapEnd) {
+                        // Calculate overlapping days
+                        $overlapDays = $overlapStart->diffInDays($overlapEnd) + 1;
+                        $allocationTotalDays = $allocation['start']->diffInDays($allocation['end']) + 1;
+
+                        // Calculate proportional amount based on days
+                        $proportion = $overlapDays / $allocationTotalDays;
+                        $proportionalAmount = (int) ($allocation['amount'] * $proportion);
+
+                        $weightedAmount += $proportionalAmount;
+                    }
+                }
+
+                // Assign the calculated amount to the period
+                if (array_key_exists($periodLabel, $amounts)) {
+                    $amounts[$periodLabel] = $weightedAmount;
+                }
+
+                // Move to the next period
+                $currentDate = $periodEnd->copy()->addDay();
+            }
+        }
+
+        return $amounts;
+    }
+
+    private function generateZeroAmounts(string $startDate, string $endDate, BudgetIntervalType $intervalType): array
+    {
+        $amounts = [];
+
+        $currentPeriod = Carbon::parse($startDate);
+        while ($currentPeriod->lte(Carbon::parse($endDate))) {
+            $period = $this->determinePeriod($currentPeriod, $intervalType);
+            $amounts[$period] = 0;
+            $currentPeriod->addUnit($intervalType->value);
+        }
+
+        return $amounts;
+    }
+
+    private function determinePeriod(Carbon $date, BudgetIntervalType $intervalType): string
+    {
+        return match ($intervalType) {
+            BudgetIntervalType::Month => $date->format('M Y'),
+            BudgetIntervalType::Quarter => 'Q' . $date->quarter . ' ' . $date->year,
+            BudgetIntervalType::Year => (string) $date->year,
+        };
+    }
+
+    private static function calculateEndDate(Carbon $startDate, BudgetIntervalType $intervalType): Carbon
+    {
+        return match ($intervalType) {
+            BudgetIntervalType::Month => $startDate->copy()->endOfMonth(),
+            BudgetIntervalType::Quarter => $startDate->copy()->endOfQuarter(),
+            BudgetIntervalType::Year => $startDate->copy()->endOfYear(),
+        };
+    }
+}

app/Filament/Company/Resources/Accounting/BudgetResource/Pages/ListBudgets.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Company\Resources\Accounting\BudgetResource\Pages;
+
+use App\Filament\Company\Resources\Accounting\BudgetResource;
+use Filament\Actions;
+use Filament\Resources\Pages\ListRecords;
+
+class ListBudgets extends ListRecords
+{
+    protected static string $resource = BudgetResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\CreateAction::make(),
+        ];
+    }
+}

app/Filament/Company/Resources/Accounting/BudgetResource/Pages/ViewBudget.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Filament\Company\Resources\Accounting\BudgetResource\Pages;
+
+use App\Filament\Company\Resources\Accounting\BudgetResource;
+use Filament\Forms\Form;
+use Filament\Infolists\Infolist;
+use Filament\Resources\Pages\ViewRecord;
+use Filament\Support\Enums\MaxWidth;
+
+class ViewBudget extends ViewRecord
+{
+    protected static string $resource = BudgetResource::class;
+
+    public function getMaxContentWidth(): MaxWidth | string | null
+    {
+        return '8xl';
+    }
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    protected function getAllRelationManagers(): array
+    {
+        return [
+            BudgetResource\RelationManagers\BudgetItemsRelationManager::class,
+        ];
+    }
+
+    public function form(Form $form): Form
+    {
+        return $form->schema([]);
+    }
+
+    public function infolist(Infolist $infolist): Infolist
+    {
+        return $infolist->schema([]);
+    }
+}

app/Filament/Company/Resources/Accounting/BudgetResource/RelationManagers/BudgetItemsRelationManager.php

@@ -0,0 +1,299 @@
+<?php
+
+namespace App\Filament\Company\Resources\Accounting\BudgetResource\RelationManagers;
+
+use App\Filament\Tables\Columns\DeferredTextInputColumn;
+use App\Models\Accounting\Budget;
+use App\Models\Accounting\BudgetAllocation;
+use App\Models\Accounting\BudgetItem;
+use App\Utilities\Currency\CurrencyConverter;
+use Filament\Notifications\Notification;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Support\RawJs;
+use Filament\Tables\Actions\Action;
+use Filament\Tables\Actions\BulkAction;
+use Filament\Tables\Columns\IconColumn;
+use Filament\Tables\Columns\Summarizers\Summarizer;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Grouping\Group;
+use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\DB;
+use stdClass;
+
+class BudgetItemsRelationManager extends RelationManager
+{
+    protected static string $relationship = 'budgetItems';
+
+    protected static bool $isLazy = false;
+
+    protected const TOTAL_COLUMN = 'total';
+
+    public array $batchChanges = [];
+
+    /**
+     * Generate a consistent key for the budget item and period
+     */
+    protected static function generatePeriodKey(int $recordId, string | Carbon $startDate): string
+    {
+        $formattedDate = $startDate instanceof Carbon
+            ? $startDate->format('Y_m_d')
+            : Carbon::parse($startDate)->format('Y_m_d');
+
+        return "{$recordId}.{$formattedDate}";
+    }
+
+    /**
+     * Generate a consistent key for the budget item's total
+     */
+    protected static function generateTotalKey(int $recordId): string
+    {
+        return "{$recordId}." . self::TOTAL_COLUMN;
+    }
+
+    public function handleBatchColumnChanged($data): void
+    {
+        $key = "{$data['recordKey']}.{$data['name']}";
+        $this->batchChanges[$key] = $data['value'];
+    }
+
+    public function saveBatchChanges(): void
+    {
+        foreach ($this->batchChanges as $key => $value) {
+            [$recordKey, $column] = explode('.', $key, 2);
+
+            try {
+                $startDate = Carbon::createFromFormat('Y_m_d', $column);
+            } catch (\Exception) {
+                continue;
+            }
+
+            $record = BudgetItem::find($recordKey);
+            if (! $record) {
+                continue;
+            }
+
+            $allocation = $record->allocations()
+                ->whereDate('start_date', $startDate)
+                ->first();
+
+            $allocation?->update(['amount' => $value]);
+        }
+
+        $this->batchChanges = [];
+
+        Notification::make()
+            ->title('Budget allocations updated')
+            ->success()
+            ->send();
+    }
+
+    protected function calculatePeriodSum(array $budgetItemIds, string | Carbon $startDate): int
+    {
+        $allocations = DB::table('budget_allocations')
+            ->whereIn('budget_item_id', $budgetItemIds)
+            ->whereDate('start_date', $startDate)
+            ->pluck('amount', 'budget_item_id');
+
+        $dbTotal = $allocations->sum();
+
+        $batchTotal = 0;
+
+        foreach ($budgetItemIds as $itemId) {
+            $key = self::generatePeriodKey($itemId, $startDate);
+
+            if (isset($this->batchChanges[$key])) {
+                $batchValue = CurrencyConverter::convertToCents($this->batchChanges[$key]);
+                $existingAmount = $allocations[$itemId] ?? 0;
+
+                $batchTotal += ($batchValue - $existingAmount);
+            }
+        }
+
+        return $dbTotal + $batchTotal;
+    }
+
+    public function table(Table $table): Table
+    {
+        /** @var Budget $budget */
+        $budget = $this->getOwnerRecord();
+        $allocationPeriods = $budget->getPeriods();
+
+        return $table
+            ->recordTitleAttribute('account_id')
+            ->paginated(false)
+            ->heading(null)
+            ->modifyQueryUsing(function (Builder $query) use ($allocationPeriods) {
+                $query->select('budget_items.*')
+                    ->leftJoin('budget_allocations', 'budget_allocations.budget_item_id', '=', 'budget_items.id');
+
+                foreach ($allocationPeriods as $period) {
+                    $alias = $period->start_date->format('Y_m_d');
+                    $query->selectRaw(
+                        "SUM(CASE WHEN budget_allocations.start_date = ? THEN budget_allocations.amount ELSE 0 END) as {$alias}",
+                        [$period->start_date->toDateString()]
+                    );
+                }
+
+                return $query->groupBy('budget_items.id');
+            })
+            ->groups([
+                Group::make('account.category')
+                    ->titlePrefixedWithLabel(false)
+                    ->collapsible(),
+            ])
+            ->recordClasses(['budget-items-relation-manager'])
+            ->defaultGroup('account.category')
+            ->headerActions([
+                Action::make('saveBatchChanges')
+                    ->label('Save all changes')
+                    ->action('saveBatchChanges')
+                    ->color('primary'),
+            ])
+            ->columns([
+                TextColumn::make('account.name')
+                    ->label('Account')
+                    ->limit(30)
+                    ->searchable(),
+                DeferredTextInputColumn::make(self::TOTAL_COLUMN)
+                    ->label('Total')
+                    ->alignRight()
+                    ->mask(RawJs::make('$money($input)'))
+                    ->getStateUsing(function (BudgetItem $record) {
+                        $key = self::generateTotalKey($record->getKey());
+                        if (isset($this->batchChanges[$key])) {
+                            return $this->batchChanges[$key];
+                        }
+
+                        $total = $record->allocations->sum(
+                            fn (BudgetAllocation $allocation) => $allocation->getRawOriginal('amount')
+                        );
+
+                        return CurrencyConverter::convertCentsToFormatSimple($total);
+                    })
+                    ->batchMode()
+                    ->summarize(
+                        Summarizer::make()
+                            ->using(function (\Illuminate\Database\Query\Builder $query) {
+                                $allocations = $query
+                                    ->leftJoin('budget_allocations', 'budget_allocations.budget_item_id', '=', 'budget_items.id')
+                                    ->select('budget_allocations.budget_item_id', 'budget_allocations.start_date', 'budget_allocations.amount')
+                                    ->get();
+
+                                $allocationsByDate = $allocations->groupBy('start_date');
+
+                                $total = 0;
+
+                                /** @var \Illuminate\Support\Collection<string, \Illuminate\Support\Collection<int, stdClass>> $allocationsByDate */
+                                foreach ($allocationsByDate as $startDate => $group) {
+                                    $dbTotal = $group->sum('amount');
+                                    $amounts = $group->pluck('amount', 'budget_item_id');
+                                    $batchTotal = 0;
+
+                                    foreach ($amounts as $itemId => $existingAmount) {
+                                        $key = self::generatePeriodKey($itemId, $startDate);
+
+                                        if (isset($this->batchChanges[$key])) {
+                                            $batchValue = CurrencyConverter::convertToCents($this->batchChanges[$key]);
+                                            $batchTotal += ($batchValue - $existingAmount);
+                                        }
+                                    }
+
+                                    $total += $dbTotal + $batchTotal;
+                                }
+
+                                return CurrencyConverter::convertCentsToFormatSimple($total);
+                            })
+                    ),
+                IconColumn::make('disperseAction')
+                    ->icon('heroicon-m-chevron-double-right')
+                    ->color('primary')
+                    ->label('')
+                    ->default('')
+                    ->tooltip('Disperse total across periods')
+                    ->action(
+                        Action::make('disperse')
+                            ->label('Disperse')
+                            ->action(function (BudgetItem $record) use ($allocationPeriods) {
+                                if (empty($allocationPeriods)) {
+                                    return;
+                                }
+
+                                $totalKey = self::generateTotalKey($record->getKey());
+                                $totalAmount = $this->batchChanges[$totalKey] ?? null;
+
+                                if (isset($totalAmount)) {
+                                    $totalCents = CurrencyConverter::convertToCents($totalAmount);
+                                } else {
+                                    $totalCents = $record->allocations->sum(function (BudgetAllocation $budgetAllocation) {
+                                        return $budgetAllocation->getRawOriginal('amount');
+                                    });
+                                }
+
+                                if ($totalCents <= 0) {
+                                    foreach ($allocationPeriods as $period) {
+                                        $periodKey = self::generatePeriodKey($record->getKey(), $period->start_date);
+                                        $this->batchChanges[$periodKey] = CurrencyConverter::convertCentsToFormatSimple(0);
+                                    }
+
+                                    return;
+                                }
+
+                                $numPeriods = count($allocationPeriods);
+
+                                $baseAmount = floor($totalCents / $numPeriods);
+                                $remainder = $totalCents - ($baseAmount * $numPeriods);
+
+                                foreach ($allocationPeriods as $index => $period) {
+                                    $amount = $baseAmount + ($index === 0 ? $remainder : 0);
+                                    $formattedAmount = CurrencyConverter::convertCentsToFormatSimple($amount);
+
+                                    $periodKey = self::generatePeriodKey($record->getKey(), $period->start_date);
+                                    $this->batchChanges[$periodKey] = $formattedAmount;
+                                }
+                            }),
+                    ),
+                ...$allocationPeriods->map(function (BudgetAllocation $period) {
+                    $alias = $period->start_date->format('Y_m_d');
+
+                    return DeferredTextInputColumn::make($alias)
+                        ->label($period->period)
+                        ->alignRight()
+                        ->batchMode()
+                        ->mask(RawJs::make('$money($input)'))
+                        ->getStateUsing(function ($record) use ($alias) {
+                            $key = "{$record->getKey()}.{$alias}";
+
+                            return $this->batchChanges[$key] ?? CurrencyConverter::convertCentsToFormatSimple($record->{$alias} ?? 0);
+                        })
+                        ->summarize(
+                            Summarizer::make()
+                                ->using(function (\Illuminate\Database\Query\Builder $query) use ($period) {
+                                    $budgetItemIds = $query->pluck('id')->toArray();
+                                    $total = $this->calculatePeriodSum($budgetItemIds, $period->start_date);
+
+                                    return CurrencyConverter::convertCentsToFormatSimple($total);
+                                })
+                        );
+                })->toArray(),
+            ])
+            ->bulkActions([
+                BulkAction::make('clearAllocations')
+                    ->label('Clear Allocations')
+                    ->icon('heroicon-o-trash')
+                    ->color('danger')
+                    ->requiresConfirmation()
+                    ->deselectRecordsAfterCompletion()
+                    ->action(function (Collection $records) use ($allocationPeriods) {
+                        foreach ($records as $record) {
+                            foreach ($allocationPeriods as $period) {
+                                $periodKey = self::generatePeriodKey($record->getKey(), $period->start_date);
+                                $this->batchChanges[$periodKey] = CurrencyConverter::convertCentsToFormatSimple(0);
+                            }
+                        }
+                    }),
+            ]);
+    }
+}

app/Filament/Company/Resources/Banking/AccountResource/Pages/CreateAccount.php

@@ -2,17 +2,15 @@
 
 namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
 
+use App\Concerns\RedirectToListPage;
 use App\Filament\Company\Resources\Banking\AccountResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateAccount extends CreateRecord
 {
-    protected static string $resource = AccountResource::class;
+    use RedirectToListPage;
 
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('index');
-    }
+    protected static string $resource = AccountResource::class;
 
     protected function mutateFormDataBeforeCreate(array $data): array
     {

app/Filament/Company/Resources/Banking/AccountResource/Pages/EditAccount.php

@@ -2,12 +2,15 @@
 
 namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
 
+use App\Concerns\RedirectToListPage;
 use App\Filament\Company\Resources\Banking\AccountResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
 class EditAccount extends EditRecord
 {
+    use RedirectToListPage;
+
     protected static string $resource = AccountResource::class;
 
     protected function getHeaderActions(): array
@@ -17,11 +20,6 @@ class EditAccount extends EditRecord
         ];
     }
 
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('index');
-    }
-
     protected function mutateFormDataBeforeSave(array $data): array
     {
         $data['enabled'] = (bool) ($data['enabled'] ?? false);

app/Filament/Company/Resources/Common/OfferingResource.php

@@ -4,9 +4,13 @@ namespace App\Filament\Company\Resources\Common;
 
 use App\Enums\Accounting\AccountCategory;
 use App\Enums\Accounting\AccountType;
+use App\Enums\Accounting\AdjustmentCategory;
+use App\Enums\Accounting\AdjustmentType;
 use App\Enums\Common\OfferingType;
 use App\Filament\Company\Resources\Common\OfferingResource\Pages;
-use App\Models\Accounting\Account;
+use App\Filament\Forms\Components\Banner;
+use App\Filament\Forms\Components\CreateAccountSelect;
+use App\Filament\Forms\Components\CreateAdjustmentSelect;
 use App\Models\Common\Offering;
 use App\Utilities\Currency\CurrencyAccessor;
 use Filament\Forms;
@@ -15,6 +19,7 @@ use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\HtmlString;
 use Illuminate\Support\Str;
 use JaOcero\RadioDeck\Forms\Components\RadioDeck;
 
@@ -28,6 +33,29 @@ class OfferingResource extends Resource
     {
         return $form
             ->schema([
+                Banner::make('inactiveAdjustments')
+                    ->label('Inactive adjustments')
+                    ->warning()
+                    ->icon('heroicon-o-exclamation-triangle')
+                    ->visible(fn (Offering $record) => $record->hasInactiveAdjustments())
+                    ->columnSpanFull()
+                    ->description(function (Offering $record) {
+                        $inactiveAdjustments = collect();
+
+                        foreach ($record->adjustments as $adjustment) {
+                            if ($adjustment->isInactive() && $inactiveAdjustments->doesntContain($adjustment->name)) {
+                                $inactiveAdjustments->push($adjustment->name);
+                            }
+                        }
+
+                        $adjustmentsList = $inactiveAdjustments->map(static function ($name) {
+                            return "<span class='font-medium'>{$name}</span>";
+                        })->join(', ');
+
+                        $output = "<p class='text-sm'>This offering contains inactive adjustments that need to be addressed: {$adjustmentsList}</p>";
+
+                        return new HtmlString($output);
+                    }),
                 Forms\Components\Section::make('General')
                     ->schema([
                         RadioDeck::make('type')
@@ -65,63 +93,52 @@ class OfferingResource extends Resource
                 // Sellable Section
                 Forms\Components\Section::make('Sale Information')
                     ->schema([
-                        Forms\Components\Select::make('income_account_id')
+                        CreateAccountSelect::make('income_account_id')
                             ->label('Income account')
-                            ->options(Account::query()
-                                ->where('category', AccountCategory::Revenue)
-                                ->where('type', AccountType::OperatingRevenue)
-                                ->pluck('name', 'id')
-                                ->toArray())
-                            ->searchable()
-                            ->preload()
+                            ->category(AccountCategory::Revenue)
+                            ->type(AccountType::OperatingRevenue)
                             ->required()
                             ->validationMessages([
                                 'required' => 'The income account is required for sellable offerings.',
                             ]),
-                        Forms\Components\Select::make('salesTaxes')
+                        CreateAdjustmentSelect::make('salesTaxes')
                             ->label('Sales tax')
-                            ->relationship('salesTaxes', 'name')
-                            ->preload()
+                            ->category(AdjustmentCategory::Tax)
+                            ->type(AdjustmentType::Sales)
                             ->multiple(),
-                        Forms\Components\Select::make('salesDiscounts')
+                        CreateAdjustmentSelect::make('salesDiscounts')
                             ->label('Sales discount')
-                            ->relationship('salesDiscounts', 'name')
-                            ->preload()
+                            ->category(AdjustmentCategory::Discount)
+                            ->type(AdjustmentType::Sales)
                             ->multiple(),
                     ])
                     ->columns()
-                    ->visible(fn (Forms\Get $get) => in_array('Sellable', $get('attributes') ?? [])),
+                    ->visible(static fn (Forms\Get $get) => in_array('Sellable', $get('attributes') ?? [])),
 
                 // Purchasable Section
                 Forms\Components\Section::make('Purchase Information')
                     ->schema([
-                        Forms\Components\Select::make('expense_account_id')
+                        CreateAccountSelect::make('expense_account_id')
                             ->label('Expense account')
-                            ->options(Account::query()
-                                ->where('category', AccountCategory::Expense)
-                                ->where('type', AccountType::OperatingExpense)
-                                ->orderBy('name')
-                                ->pluck('name', 'id')
-                                ->toArray())
-                            ->searchable()
-                            ->preload()
+                            ->category(AccountCategory::Expense)
+                            ->type(AccountType::OperatingExpense)
                             ->required()
                             ->validationMessages([
                                 'required' => 'The expense account is required for purchasable offerings.',
                             ]),
-                        Forms\Components\Select::make('purchaseTaxes')
+                        CreateAdjustmentSelect::make('purchaseTaxes')
                             ->label('Purchase tax')
-                            ->relationship('purchaseTaxes', 'name')
-                            ->preload()
+                            ->category(AdjustmentCategory::Tax)
+                            ->type(AdjustmentType::Purchase)
                             ->multiple(),
-                        Forms\Components\Select::make('purchaseDiscounts')
+                        CreateAdjustmentSelect::make('purchaseDiscounts')
                             ->label('Purchase discount')
-                            ->relationship('purchaseDiscounts', 'name')
-                            ->preload()
+                            ->category(AdjustmentCategory::Discount)
+                            ->type(AdjustmentType::Purchase)
                             ->multiple(),
                     ])
                     ->columns()
-                    ->visible(fn (Forms\Get $get) => in_array('Purchasable', $get('attributes') ?? [])),
+                    ->visible(static fn (Forms\Get $get) => in_array('Purchasable', $get('attributes') ?? [])),
             ])->columns();
     }
 

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

@@ -2,12 +2,16 @@
 
 namespace App\Filament\Company\Resources\Purchases;
 
+use App\Enums\Accounting\AdjustmentCategory;
+use App\Enums\Accounting\AdjustmentStatus;
+use App\Enums\Accounting\AdjustmentType;
 use App\Enums\Accounting\BillStatus;
 use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\DocumentType;
 use App\Enums\Accounting\PaymentMethod;
 use App\Filament\Company\Resources\Purchases\BillResource\Pages;
 use App\Filament\Company\Resources\Purchases\VendorResource\RelationManagers\BillsRelationManager;
+use App\Filament\Forms\Components\CreateAdjustmentSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\DocumentTotals;
 use App\Filament\Tables\Actions\ReplicateBulkAction;
@@ -15,6 +19,7 @@ use App\Filament\Tables\Columns;
 use App\Filament\Tables\Filters\DateRangeFilter;
 use App\Models\Accounting\Adjustment;
 use App\Models\Accounting\Bill;
+use App\Models\Accounting\DocumentLineItem;
 use App\Models\Banking\BankAccount;
 use App\Models\Common\Offering;
 use App\Models\Common\Vendor;
@@ -117,17 +122,17 @@ class BillResource extends Resource
                                     Header::make($settings->resolveColumnLabel('item_name', 'Items'))
                                         ->width($hasDiscounts ? '15%' : '20%'),
                                     Header::make('Description')
-                                        ->width($hasDiscounts ? '25%' : '30%'),
+                                        ->width($hasDiscounts ? '15%' : '20%'),
                                     Header::make($settings->resolveColumnLabel('unit_name', 'Quantity'))
                                         ->width('10%'),
                                     Header::make($settings->resolveColumnLabel('price_name', 'Price'))
                                         ->width('10%'),
                                     Header::make('Taxes')
-                                        ->width($hasDiscounts ? '15%' : '20%'),
+                                        ->width($hasDiscounts ? '20%' : '30%'),
                                 ];
 
                                 if ($hasDiscounts) {
-                                    $headers[] = Header::make('Discounts')->width('15%');
+                                    $headers[] = Header::make('Discounts')->width('20%');
                                 }
 
                                 $headers[] = Header::make($settings->resolveColumnLabel('amount_name', 'Amount'))
@@ -144,9 +149,40 @@ class BillResource extends Resource
                                     ->searchable()
                                     ->required()
                                     ->live()
-                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
                                         $offeringId = $state;
-                                        $offeringRecord = Offering::with(['purchaseTaxes', 'purchaseDiscounts'])->find($offeringId);
+                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+                                        $isPerLineItem = $discountMethod->isPerLineItem();
+
+                                        $existingTaxIds = [];
+                                        $existingDiscountIds = [];
+
+                                        if ($record) {
+                                            $existingTaxIds = $record->purchaseTaxes()->pluck('adjustments.id')->toArray();
+                                            if ($isPerLineItem) {
+                                                $existingDiscountIds = $record->purchaseDiscounts()->pluck('adjustments.id')->toArray();
+                                            }
+                                        }
+
+                                        $with = [
+                                            'purchaseTaxes' => static function ($query) use ($existingTaxIds) {
+                                                $query->where(static function ($query) use ($existingTaxIds) {
+                                                    $query->where('status', AdjustmentStatus::Active)
+                                                        ->orWhereIn('adjustments.id', $existingTaxIds);
+                                                });
+                                            },
+                                        ];
+
+                                        if ($isPerLineItem) {
+                                            $with['purchaseDiscounts'] = static function ($query) use ($existingDiscountIds) {
+                                                $query->where(static function ($query) use ($existingDiscountIds) {
+                                                    $query->where('status', AdjustmentStatus::Active)
+                                                        ->orWhereIn('adjustments.id', $existingDiscountIds);
+                                                });
+                                            };
+                                        }
+
+                                        $offeringRecord = Offering::with($with)->find($offeringId);
 
                                         if (! $offeringRecord) {
                                             return;
@@ -158,8 +194,7 @@ class BillResource extends Resource
                                         $set('unit_price', $unitPrice);
                                         $set('purchaseTaxes', $offeringRecord->purchaseTaxes->pluck('id')->toArray());
 
-                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
-                                        if ($discountMethod->isPerLineItem()) {
+                                        if ($isPerLineItem) {
                                             $set('purchaseDiscounts', $offeringRecord->purchaseDiscounts->pluck('id')->toArray());
                                         }
                                     }),
@@ -177,21 +212,24 @@ class BillResource extends Resource
                                     ->live()
                                     ->maxValue(9999999999.99)
                                     ->default(0),
-                                Forms\Components\Select::make('purchaseTaxes')
+                                CreateAdjustmentSelect::make('purchaseTaxes')
                                     ->label('Taxes')
-                                    ->relationship('purchaseTaxes', 'name')
+                                    ->category(AdjustmentCategory::Tax)
+                                    ->type(AdjustmentType::Purchase)
+                                    ->adjustmentsRelationship('purchaseTaxes')
                                     ->saveRelationshipsUsing(null)
                                     ->dehydrated(true)
                                     ->preload()
                                     ->multiple()
                                     ->live()
                                     ->searchable(),
-                                Forms\Components\Select::make('purchaseDiscounts')
+                                CreateAdjustmentSelect::make('purchaseDiscounts')
                                     ->label('Discounts')
-                                    ->relationship('purchaseDiscounts', 'name')
+                                    ->category(AdjustmentCategory::Discount)
+                                    ->type(AdjustmentType::Purchase)
+                                    ->adjustmentsRelationship('purchaseDiscounts')
                                     ->saveRelationshipsUsing(null)
                                     ->dehydrated(true)
-                                    ->preload()
                                     ->multiple()
                                     ->live()
                                     ->hidden(function (Forms\Get $get) {
@@ -288,7 +326,8 @@ class BillResource extends Resource
                 Tables\Filters\SelectFilter::make('vendor')
                     ->relationship('vendor', 'name')
                     ->searchable()
-                    ->preload(),
+                    ->preload()
+                    ->hiddenOn(BillsRelationManager::class),
                 Tables\Filters\SelectFilter::make('status')
                     ->options(BillStatus::class)
                     ->native(false),
@@ -374,9 +413,13 @@ class BillResource extends Resource
                                 Forms\Components\Select::make('bank_account_id')
                                     ->label('Account')
                                     ->required()
-                                    ->options(BankAccount::query()
-                                        ->get()
-                                        ->pluck('account.name', 'id'))
+                                    ->options(function () {
+                                        return BankAccount::query()
+                                            ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
+                                            ->select(['bank_accounts.id', 'accounts.name'])
+                                            ->pluck('accounts.name', 'bank_accounts.id')
+                                            ->toArray();
+                                    })
                                     ->searchable(),
                                 Forms\Components\Textarea::make('notes')
                                     ->label('Notes'),
@@ -483,9 +526,13 @@ class BillResource extends Resource
                             Forms\Components\Select::make('bank_account_id')
                                 ->label('Account')
                                 ->required()
-                                ->options(BankAccount::query()
-                                    ->get()
-                                    ->pluck('account.name', 'id'))
+                                ->options(function () {
+                                    return BankAccount::query()
+                                        ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
+                                        ->select(['bank_accounts.id', 'accounts.name'])
+                                        ->pluck('accounts.name', 'bank_accounts.id')
+                                        ->toArray();
+                                })
                                 ->searchable(),
                             Forms\Components\Textarea::make('notes')
                                 ->label('Notes'),
@@ -531,13 +578,6 @@ class BillResource extends Resource
             ]);
     }
 
-    public static function getRelations(): array
-    {
-        return [
-            BillResource\RelationManagers\PaymentsRelationManager::class,
-        ];
-    }
-
     public static function getPages(): array
     {
         return [

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

@@ -3,7 +3,7 @@
 namespace App\Filament\Company\Resources\Purchases\BillResource\Pages;
 
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToListPage;
+use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Purchases\BillResource;
 use App\Models\Accounting\Bill;
 use App\Models\Common\Vendor;
@@ -15,7 +15,7 @@ use Livewire\Attributes\Url;
 class CreateBill extends CreateRecord
 {
     use ManagesLineItems;
-    use RedirectToListPage;
+    use RedirectToViewPage;
 
     protected static string $resource = BillResource::class;
 

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

@@ -3,6 +3,7 @@
 namespace App\Filament\Company\Resources\Purchases\BillResource\Pages;
 
 use App\Concerns\ManagesLineItems;
+use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Purchases\BillResource;
 use App\Models\Accounting\Bill;
 use Filament\Actions;
@@ -13,6 +14,7 @@ use Illuminate\Database\Eloquent\Model;
 class EditBill extends EditRecord
 {
     use ManagesLineItems;
+    use RedirectToViewPage;
 
     protected static string $resource = BillResource::class;
 
@@ -28,11 +30,6 @@ class EditBill extends EditRecord
         return MaxWidth::Full;
     }
 
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('view', ['record' => $this->record]);
-    }
-
     protected function handleRecordUpdate(Model $record, array $data): Model
     {
         /** @var Bill $record */

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

@@ -62,10 +62,10 @@ class ViewBill extends ViewRecord
                             ->url(static fn (Bill $record) => VendorResource::getUrl('edit', ['record' => $record->vendor_id])),
                         TextEntry::make('total')
                             ->label('Total')
-                            ->money(),
+                            ->currency(fn (Bill $record) => $record->currency_code),
                         TextEntry::make('amount_due')
                             ->label('Amount due')
-                            ->money(),
+                            ->currency(fn (Bill $record) => $record->currency_code),
                         TextEntry::make('date')
                             ->label('Date')
                             ->date(),
@@ -79,4 +79,11 @@ class ViewBill extends ViewRecord
                     ]),
             ]);
     }
+
+    protected function getAllRelationManagers(): array
+    {
+        return [
+            BillResource\RelationManagers\PaymentsRelationManager::class,
+        ];
+    }
 }

app/Filament/Company/Resources/Purchases/BillResource/RelationManagers/PaymentsRelationManager.php

@@ -4,7 +4,6 @@ namespace App\Filament\Company\Resources\Purchases\BillResource\RelationManagers
 
 use App\Enums\Accounting\PaymentMethod;
 use App\Enums\Accounting\TransactionType;
-use App\Filament\Company\Resources\Purchases\BillResource\Pages\ViewBill;
 use App\Models\Accounting\Bill;
 use App\Models\Accounting\Transaction;
 use App\Models\Banking\BankAccount;
@@ -19,7 +18,6 @@ use Filament\Support\Enums\FontWeight;
 use Filament\Support\Enums\MaxWidth;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Model;
 
 class PaymentsRelationManager extends RelationManager
 {
@@ -36,11 +34,6 @@ class PaymentsRelationManager extends RelationManager
         return false;
     }
 
-    public static function canViewForRecord(Model $ownerRecord, string $pageClass): bool
-    {
-        return $pageClass === ViewBill::class;
-    }
-
     public function form(Form $form): Form
     {
         return $form
@@ -48,55 +41,139 @@ class PaymentsRelationManager extends RelationManager
             ->schema([
                 Forms\Components\DatePicker::make('posted_at')
                     ->label('Date'),
-                Forms\Components\TextInput::make('amount')
-                    ->label('Amount')
-                    ->required()
-                    ->money()
-                    ->live(onBlur: true)
-                    ->helperText(function (RelationManager $livewire, $state, ?Transaction $record) {
-                        if (! CurrencyConverter::isValidAmount($state)) {
+                Forms\Components\Grid::make()
+                    ->schema([
+                        Forms\Components\Select::make('bank_account_id')
+                            ->label('Account')
+                            ->required()
+                            ->live()
+                            ->options(function () {
+                                return BankAccount::query()
+                                    ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
+                                    ->select(['bank_accounts.id', 'accounts.name', 'accounts.currency_code'])
+                                    ->get()
+                                    ->mapWithKeys(function ($account) {
+                                        $label = $account->name;
+                                        if ($account->currency_code) {
+                                            $label .= " ({$account->currency_code})";
+                                        }
+
+                                        return [$account->id => $label];
+                                    })
+                                    ->toArray();
+                            })
+                            ->searchable(),
+                        Forms\Components\TextInput::make('amount')
+                            ->label('Amount')
+                            ->required()
+                            ->money(function (RelationManager $livewire) {
+                                /** @var Bill $bill */
+                                $bill = $livewire->getOwnerRecord();
+
+                                return $bill->currency_code;
+                            })
+                            ->live(onBlur: true)
+                            ->helperText(function (RelationManager $livewire, $state, ?Transaction $record) {
+                                /** @var Bill $ownerRecord */
+                                $ownerRecord = $livewire->getOwnerRecord();
+
+                                $billCurrency = $ownerRecord->currency_code;
+
+                                if (! CurrencyConverter::isValidAmount($state, $billCurrency)) {
+                                    return null;
+                                }
+
+                                $amountDue = $ownerRecord->getRawOriginal('amount_due');
+
+                                $amount = CurrencyConverter::convertToCents($state, $billCurrency);
+
+                                if ($amount <= 0) {
+                                    return 'Please enter a valid positive amount';
+                                }
+
+                                $currentPaymentAmount = $record?->getRawOriginal('amount') ?? 0;
+
+                                $newAmountDue = $amountDue - $amount + $currentPaymentAmount;
+
+                                return match (true) {
+                                    $newAmountDue > 0 => 'Amount due after payment will be ' . CurrencyConverter::formatCentsToMoney($newAmountDue, $billCurrency),
+                                    $newAmountDue === 0 => 'Bill will be fully paid',
+                                    default => 'Amount exceeds bill total by ' . CurrencyConverter::formatCentsToMoney(abs($newAmountDue), $billCurrency),
+                                };
+                            })
+                            ->rules([
+                                static fn (RelationManager $livewire): Closure => static function (string $attribute, $value, Closure $fail) use ($livewire) {
+                                    /** @var Bill $bill */
+                                    $bill = $livewire->getOwnerRecord();
+
+                                    if (! CurrencyConverter::isValidAmount($value, $bill->currency_code)) {
+                                        $fail('Please enter a valid amount');
+                                    }
+                                },
+                            ]),
+                    ])->columns(2),
+                Forms\Components\Placeholder::make('currency_conversion')
+                    ->label('Currency Conversion')
+                    ->content(function (Forms\Get $get, RelationManager $livewire) {
+                        $amount = $get('amount');
+                        $bankAccountId = $get('bank_account_id');
+
+                        /** @var Bill $bill */
+                        $bill = $livewire->getOwnerRecord();
+                        $billCurrency = $bill->currency_code;
+
+                        if (empty($amount) || empty($bankAccountId) || ! CurrencyConverter::isValidAmount($amount, $billCurrency)) {
                             return null;
                         }
 
-                        /** @var Bill $ownerRecord */
-                        $ownerRecord = $livewire->getOwnerRecord();
-
-                        $amountDue = $ownerRecord->getRawOriginal('amount_due');
+                        $bankAccount = BankAccount::with('account')->find($bankAccountId);
+                        if (! $bankAccount) {
+                            return null;
+                        }
 
-                        $amount = CurrencyConverter::convertToCents($state);
+                        $bankCurrency = $bankAccount->account->currency_code ?? CurrencyAccessor::getDefaultCurrency();
 
-                        if ($amount <= 0) {
-                            return 'Please enter a valid positive amount';
+                        // If currencies are the same, no conversion needed
+                        if ($billCurrency === $bankCurrency) {
+                            return null;
                         }
 
-                        $currentPaymentAmount = $record?->getRawOriginal('amount') ?? 0;
+                        // Convert amount from bill currency to bank currency
+                        $amountInBillCurrencyCents = CurrencyConverter::convertToCents($amount, $billCurrency);
+                        $amountInBankCurrencyCents = CurrencyConverter::convertBalance(
+                            $amountInBillCurrencyCents,
+                            $billCurrency,
+                            $bankCurrency
+                        );
 
-                        $newAmountDue = $amountDue - $amount + $currentPaymentAmount;
+                        $formattedBankAmount = CurrencyConverter::formatCentsToMoney($amountInBankCurrencyCents, $bankCurrency);
 
-                        return match (true) {
-                            $newAmountDue > 0 => 'Amount due after payment will be ' . CurrencyConverter::formatCentsToMoney($newAmountDue),
-                            $newAmountDue === 0 => 'Bill will be fully paid',
-                            default => 'Amount exceeds bill total by ' . CurrencyConverter::formatCentsToMoney(abs($newAmountDue)),
-                        };
+                        return "Payment will be recorded as {$formattedBankAmount} in the bank account's currency ({$bankCurrency}).";
                     })
-                    ->rules([
-                        static fn (): Closure => static function (string $attribute, $value, Closure $fail) {
-                            if (! CurrencyConverter::isValidAmount($value)) {
-                                $fail('Please enter a valid amount');
-                            }
-                        },
-                    ]),
+                    ->hidden(function (Forms\Get $get, RelationManager $livewire) {
+                        $bankAccountId = $get('bank_account_id');
+                        if (empty($bankAccountId)) {
+                            return true;
+                        }
+
+                        /** @var Bill $bill */
+                        $bill = $livewire->getOwnerRecord();
+                        $billCurrency = $bill->currency_code;
+
+                        $bankAccount = BankAccount::with('account')->find($bankAccountId);
+                        if (! $bankAccount) {
+                            return true;
+                        }
+
+                        $bankCurrency = $bankAccount->account->currency_code ?? CurrencyAccessor::getDefaultCurrency();
+
+                        // Hide if currencies are the same
+                        return $billCurrency === $bankCurrency;
+                    }),
                 Forms\Components\Select::make('payment_method')
                     ->label('Payment method')
                     ->required()
                     ->options(PaymentMethod::class),
-                Forms\Components\Select::make('bank_account_id')
-                    ->label('Account')
-                    ->required()
-                    ->options(BankAccount::query()
-                        ->get()
-                        ->pluck('account.name', 'id'))
-                    ->searchable(),
                 Forms\Components\Textarea::make('notes')
                     ->label('Notes'),
             ]);

app/Filament/Company/Resources/Purchases/BillResource/Widgets/BillOverview.php

@@ -21,8 +21,47 @@ class BillOverview extends EnhancedStatsOverviewWidget
 
     protected function getStats(): array
     {
+        $activeTab = $this->activeTab;
+
+        $averagePaymentTimeFormatted = '-';
+        $averagePaymentTimeSuffix = null;
+        $lastMonthTotal = '-';
+        $lastMonthTotalSuffix = null;
+
+        if ($activeTab !== 'unpaid') {
+            $averagePaymentTime = $this->getPageTableQuery()
+                ->whereNotNull('paid_at')
+                ->selectRaw('AVG(TIMESTAMPDIFF(DAY, date, paid_at)) as avg_days')
+                ->value('avg_days');
+
+            $averagePaymentTimeFormatted = Number::format($averagePaymentTime ?? 0, maxPrecision: 1);
+            $averagePaymentTimeSuffix = 'days';
+
+            $lastMonthPaid = $this->getPageTableQuery()
+                ->whereBetween('date', [
+                    today()->subMonth()->startOfMonth(),
+                    today()->subMonth()->endOfMonth(),
+                ])
+                ->get()
+                ->sumMoneyInDefaultCurrency('amount_paid');
+
+            $lastMonthTotal = CurrencyConverter::formatCentsToMoney($lastMonthPaid);
+            $lastMonthTotalSuffix = CurrencyAccessor::getDefaultCurrency();
+        }
+
+        if ($activeTab === 'paid') {
+            return [
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Total To Pay', '-'),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Due Within 7 Days', '-'),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Average Payment Time', $averagePaymentTimeFormatted)
+                    ->suffix($averagePaymentTimeSuffix),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Paid Last Month', $lastMonthTotal)
+                    ->suffix($lastMonthTotalSuffix),
+            ];
+        }
+
         $unpaidBills = $this->getPageTableQuery()
-            ->whereIn('status', [BillStatus::Open, BillStatus::Partial, BillStatus::Overdue]);
+            ->unpaid();
 
         $amountToPay = $unpaidBills->get()->sumMoneyInDefaultCurrency('amount_due');
 
@@ -38,35 +77,16 @@ class BillOverview extends EnhancedStatsOverviewWidget
             ->get()
             ->sumMoneyInDefaultCurrency('amount_due');
 
-        $averagePaymentTime = $this->getPageTableQuery()
-            ->whereNotNull('paid_at')
-            ->selectRaw('AVG(TIMESTAMPDIFF(DAY, date, paid_at)) as avg_days')
-            ->value('avg_days');
-
-        $averagePaymentTimeFormatted = Number::format($averagePaymentTime ?? 0, maxPrecision: 1);
-
-        $lastMonthTotal = $this->getPageTableQuery()
-            ->where('status', BillStatus::Paid)
-            ->whereBetween('date', [
-                today()->subMonth()->startOfMonth(),
-                today()->subMonth()->endOfMonth(),
-            ])
-            ->get()
-            ->sumMoneyInDefaultCurrency('amount_paid');
-
         return [
             EnhancedStatsOverviewWidget\EnhancedStat::make('Total To Pay', CurrencyConverter::formatCentsToMoney($amountToPay))
                 ->suffix(CurrencyAccessor::getDefaultCurrency())
                 ->description('Includes ' . CurrencyConverter::formatCentsToMoney($amountOverdue) . ' overdue'),
-
             EnhancedStatsOverviewWidget\EnhancedStat::make('Due Within 7 Days', CurrencyConverter::formatCentsToMoney($amountDueWithin7Days))
                 ->suffix(CurrencyAccessor::getDefaultCurrency()),
-
             EnhancedStatsOverviewWidget\EnhancedStat::make('Average Payment Time', $averagePaymentTimeFormatted)
-                ->suffix('days'),
-
-            EnhancedStatsOverviewWidget\EnhancedStat::make('Paid Last Month', CurrencyConverter::formatCentsToMoney($lastMonthTotal))
-                ->suffix(CurrencyAccessor::getDefaultCurrency()),
+                ->suffix($averagePaymentTimeSuffix),
+            EnhancedStatsOverviewWidget\EnhancedStat::make('Paid Last Month', $lastMonthTotal)
+                ->suffix($lastMonthTotalSuffix),
         ];
     }
 }

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

@@ -2,7 +2,7 @@
 
 namespace App\Filament\Company\Resources\Purchases\VendorResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Purchases\VendorResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
@@ -10,7 +10,7 @@ use Filament\Support\Enums\MaxWidth;
 
 class EditVendor extends EditRecord
 {
-    use RedirectToListPage;
+    use RedirectToViewPage;
 
     protected static string $resource = VendorResource::class;
 

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

@@ -20,7 +20,7 @@ class ViewVendor extends ViewRecord
 {
     protected static string $resource = VendorResource::class;
 
-    public function getRelationManagers(): array
+    protected function getAllRelationManagers(): array
     {
         return [
             RelationManagers\BillsRelationManager::class,

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

@@ -225,7 +225,7 @@ class ClientResource extends Resource
                                         $fieldsToSync = [
                                             'address_line_1',
                                             'address_line_2',
-                                            'country',
+                                            'country_code',
                                             'state_id',
                                             'city',
                                             'postal_code',

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

@@ -5,6 +5,7 @@ namespace App\Filament\Company\Resources\Sales\ClientResource\Pages;
 use App\Concerns\RedirectToListPage;
 use App\Enums\Common\AddressType;
 use App\Filament\Company\Resources\Sales\ClientResource;
+use App\Models\Common\Address;
 use App\Models\Common\Client;
 use Filament\Resources\Pages\CreateRecord;
 use Filament\Support\Enums\MaxWidth;
@@ -27,6 +28,7 @@ class CreateClient extends CreateRecord
         $record = parent::handleRecordCreation($data);
 
         // Create billing address first
+        /** @var Address $billingAddress */
         $billingAddress = $record->addresses()->create([
             ...$data['billingAddress'],
             'type' => AddressType::Billing,

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

@@ -2,7 +2,7 @@
 
 namespace App\Filament\Company\Resources\Sales\ClientResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Sales\ClientResource;
 use App\Models\Common\Client;
 use Filament\Actions;
@@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class EditClient extends EditRecord
 {
-    use RedirectToListPage;
+    use RedirectToViewPage;
 
     protected static string $resource = ClientResource::class;
 

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

@@ -23,7 +23,7 @@ class ViewClient extends ViewRecord
 {
     protected static string $resource = ClientResource::class;
 
-    public function getRelationManagers(): array
+    protected function getAllRelationManagers(): array
     {
         return [
             RelationManagers\InvoicesRelationManager::class,

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

@@ -2,11 +2,16 @@
 
 namespace App\Filament\Company\Resources\Sales;
 
+use App\Enums\Accounting\AdjustmentCategory;
+use App\Enums\Accounting\AdjustmentStatus;
+use App\Enums\Accounting\AdjustmentType;
 use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\DocumentType;
 use App\Enums\Accounting\EstimateStatus;
+use App\Filament\Company\Resources\Sales\ClientResource\RelationManagers\EstimatesRelationManager;
 use App\Filament\Company\Resources\Sales\EstimateResource\Pages;
 use App\Filament\Company\Resources\Sales\EstimateResource\Widgets;
+use App\Filament\Forms\Components\CreateAdjustmentSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\DocumentFooterSection;
 use App\Filament\Forms\Components\DocumentHeaderSection;
@@ -15,6 +20,7 @@ use App\Filament\Tables\Actions\ReplicateBulkAction;
 use App\Filament\Tables\Columns;
 use App\Filament\Tables\Filters\DateRangeFilter;
 use App\Models\Accounting\Adjustment;
+use App\Models\Accounting\DocumentLineItem;
 use App\Models\Accounting\Estimate;
 use App\Models\Common\Client;
 use App\Models\Common\Offering;
@@ -123,17 +129,17 @@ class EstimateResource extends Resource
                                     Header::make($settings->resolveColumnLabel('item_name', 'Items'))
                                         ->width($hasDiscounts ? '15%' : '20%'),
                                     Header::make('Description')
-                                        ->width($hasDiscounts ? '25%' : '30%'),
+                                        ->width($hasDiscounts ? '15%' : '20%'),
                                     Header::make($settings->resolveColumnLabel('unit_name', 'Quantity'))
                                         ->width('10%'),
                                     Header::make($settings->resolveColumnLabel('price_name', 'Price'))
                                         ->width('10%'),
                                     Header::make('Taxes')
-                                        ->width($hasDiscounts ? '15%' : '20%'),
+                                        ->width($hasDiscounts ? '20%' : '30%'),
                                 ];
 
                                 if ($hasDiscounts) {
-                                    $headers[] = Header::make('Discounts')->width('15%');
+                                    $headers[] = Header::make('Discounts')->width('20%');
                                 }
 
                                 $headers[] = Header::make($settings->resolveColumnLabel('amount_name', 'Amount'))
@@ -149,9 +155,40 @@ class EstimateResource extends Resource
                                     ->searchable()
                                     ->required()
                                     ->live()
-                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
                                         $offeringId = $state;
-                                        $offeringRecord = Offering::with(['salesTaxes', 'salesDiscounts'])->find($offeringId);
+                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+                                        $isPerLineItem = $discountMethod->isPerLineItem();
+
+                                        $existingTaxIds = [];
+                                        $existingDiscountIds = [];
+
+                                        if ($record) {
+                                            $existingTaxIds = $record->salesTaxes()->pluck('adjustments.id')->toArray();
+                                            if ($isPerLineItem) {
+                                                $existingDiscountIds = $record->salesDiscounts()->pluck('adjustments.id')->toArray();
+                                            }
+                                        }
+
+                                        $with = [
+                                            'salesTaxes' => static function ($query) use ($existingTaxIds) {
+                                                $query->where(static function ($query) use ($existingTaxIds) {
+                                                    $query->where('status', AdjustmentStatus::Active)
+                                                        ->orWhereIn('adjustments.id', $existingTaxIds);
+                                                });
+                                            },
+                                        ];
+
+                                        if ($isPerLineItem) {
+                                            $with['salesDiscounts'] = static function ($query) use ($existingDiscountIds) {
+                                                $query->where(static function ($query) use ($existingDiscountIds) {
+                                                    $query->where('status', AdjustmentStatus::Active)
+                                                        ->orWhereIn('adjustments.id', $existingDiscountIds);
+                                                });
+                                            };
+                                        }
+
+                                        $offeringRecord = Offering::with($with)->find($offeringId);
 
                                         if (! $offeringRecord) {
                                             return;
@@ -163,8 +200,7 @@ class EstimateResource extends Resource
                                         $set('unit_price', $unitPrice);
                                         $set('salesTaxes', $offeringRecord->salesTaxes->pluck('id')->toArray());
 
-                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
-                                        if ($discountMethod->isPerLineItem()) {
+                                        if ($isPerLineItem) {
                                             $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
                                         }
                                     }),
@@ -181,19 +217,24 @@ class EstimateResource extends Resource
                                     ->live()
                                     ->maxValue(9999999999.99)
                                     ->default(0),
-                                Forms\Components\Select::make('salesTaxes')
-                                    ->relationship('salesTaxes', 'name')
+                                CreateAdjustmentSelect::make('salesTaxes')
+                                    ->label('Taxes')
+                                    ->category(AdjustmentCategory::Tax)
+                                    ->type(AdjustmentType::Sales)
+                                    ->adjustmentsRelationship('salesTaxes')
                                     ->saveRelationshipsUsing(null)
                                     ->dehydrated(true)
                                     ->preload()
                                     ->multiple()
                                     ->live()
                                     ->searchable(),
-                                Forms\Components\Select::make('salesDiscounts')
-                                    ->relationship('salesDiscounts', 'name')
+                                CreateAdjustmentSelect::make('salesDiscounts')
+                                    ->label('Discounts')
+                                    ->category(AdjustmentCategory::Discount)
+                                    ->type(AdjustmentType::Sales)
+                                    ->adjustmentsRelationship('salesDiscounts')
                                     ->saveRelationshipsUsing(null)
                                     ->dehydrated(true)
-                                    ->preload()
                                     ->multiple()
                                     ->live()
                                     ->hidden(function (Forms\Get $get) {
@@ -275,7 +316,8 @@ class EstimateResource extends Resource
                     ->sortable(),
                 Tables\Columns\TextColumn::make('client.name')
                     ->sortable()
-                    ->searchable(),
+                    ->searchable()
+                    ->hiddenOn(EstimatesRelationManager::class),
                 Tables\Columns\TextColumn::make('total')
                     ->currencyWithConversion(static fn (Estimate $record) => $record->currency_code)
                     ->sortable()
@@ -285,7 +327,8 @@ class EstimateResource extends Resource
                 Tables\Filters\SelectFilter::make('client')
                     ->relationship('client', 'name')
                     ->searchable()
-                    ->preload(),
+                    ->preload()
+                    ->hiddenOn(EstimatesRelationManager::class),
                 Tables\Filters\SelectFilter::make('status')
                     ->options(EstimateStatus::class)
                     ->native(false),

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

@@ -3,6 +3,7 @@
 namespace App\Filament\Company\Resources\Sales\EstimateResource\Pages;
 
 use App\Concerns\ManagesLineItems;
+use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Sales\EstimateResource;
 use App\Models\Accounting\Estimate;
 use Filament\Actions;
@@ -13,6 +14,7 @@ use Illuminate\Database\Eloquent\Model;
 class EditEstimate extends EditRecord
 {
     use ManagesLineItems;
+    use RedirectToViewPage;
 
     protected static string $resource = EstimateResource::class;
 
@@ -28,11 +30,6 @@ class EditEstimate extends EditRecord
         return MaxWidth::Full;
     }
 
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('view', ['record' => $this->record]);
-    }
-
     protected function handleRecordUpdate(Model $record, array $data): Model
     {
         /** @var Estimate $record */

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

@@ -5,6 +5,7 @@ namespace App\Filament\Company\Resources\Sales\EstimateResource\Pages;
 use App\Enums\Accounting\DocumentType;
 use App\Filament\Company\Resources\Sales\ClientResource;
 use App\Filament\Company\Resources\Sales\EstimateResource;
+use App\Filament\Infolists\Components\BannerEntry;
 use App\Filament\Infolists\Components\DocumentPreview;
 use App\Models\Accounting\Estimate;
 use Filament\Actions;
@@ -17,6 +18,7 @@ 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 ViewEstimate extends ViewRecord
 {
@@ -63,6 +65,31 @@ class ViewEstimate extends ViewRecord
     {
         return $infolist
             ->schema([
+                BannerEntry::make('inactiveAdjustments')
+                    ->label('Inactive adjustments')
+                    ->warning()
+                    ->icon('heroicon-o-exclamation-triangle')
+                    ->visible(fn (Estimate $record) => $record->hasInactiveAdjustments() && $record->canBeApproved())
+                    ->columnSpanFull()
+                    ->description(function (Estimate $record) {
+                        $inactiveAdjustments = collect();
+
+                        foreach ($record->lineItems as $lineItem) {
+                            foreach ($lineItem->adjustments as $adjustment) {
+                                if ($adjustment->isInactive() && $inactiveAdjustments->doesntContain($adjustment->name)) {
+                                    $inactiveAdjustments->push($adjustment->name);
+                                }
+                            }
+                        }
+
+                        $adjustmentsList = $inactiveAdjustments->map(static function ($name) {
+                            return "<span class='font-medium'>{$name}</span>";
+                        })->join(', ');
+
+                        $output = "<p class='text-sm'>This estimate contains inactive adjustments that need to be addressed before approval: {$adjustmentsList}</p>";
+
+                        return new HtmlString($output);
+                    }),
                 Section::make('Estimate Details')
                     ->columns(4)
                     ->schema([

app/Filament/Company/Resources/Sales/EstimateResource/Widgets/EstimateOverview.php

@@ -21,6 +21,26 @@ class EstimateOverview extends EnhancedStatsOverviewWidget
 
     protected function getStats(): array
     {
+        $activeTab = $this->activeTab;
+
+        if ($activeTab === 'draft') {
+            $draftEstimates = $this->getPageTableQuery();
+            $totalDraftCount = $draftEstimates->count();
+            $totalDraftAmount = $draftEstimates->get()->sumMoneyInDefaultCurrency('total');
+
+            $averageDraftTotal = $totalDraftCount > 0
+                ? (int) round($totalDraftAmount / $totalDraftCount)
+                : 0;
+
+            return [
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Active Estimates', '-'),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Accepted Estimates', '-'),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Converted Estimates', '-'),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Average Estimate Total', CurrencyConverter::formatCentsToMoney($averageDraftTotal))
+                    ->suffix(CurrencyAccessor::getDefaultCurrency()),
+            ];
+        }
+
         $activeEstimates = $this->getPageTableQuery()->active();
 
         $totalActiveCount = $activeEstimates->count();
@@ -36,20 +56,32 @@ class EstimateOverview extends EnhancedStatsOverviewWidget
             ->where('status', EstimateStatus::Converted);
 
         $totalConvertedCount = $convertedEstimates->count();
-        $totalEstimatesCount = $this->getPageTableQuery()->count();
 
-        $percentConverted = $totalEstimatesCount > 0
-            ? Number::percentage(($totalConvertedCount / $totalEstimatesCount) * 100, maxPrecision: 1)
-            : Number::percentage(0, maxPrecision: 1);
+        $validEstimates = $this->getPageTableQuery()
+            ->whereNotIn('status', [
+                EstimateStatus::Draft,
+            ]);
 
-        $totalEstimateAmount = $this->getPageTableQuery()
-            ->get()
-            ->sumMoneyInDefaultCurrency('total');
+        $totalValidEstimatesCount = $validEstimates->count();
+        $totalValidEstimateAmount = $validEstimates->get()->sumMoneyInDefaultCurrency('total');
 
-        $averageEstimateTotal = $totalEstimatesCount > 0
-            ? (int) round($totalEstimateAmount / $totalEstimatesCount)
+        $averageEstimateTotal = $totalValidEstimatesCount > 0
+            ? (int) round($totalValidEstimateAmount / $totalValidEstimatesCount)
             : 0;
 
+        $percentConverted = '-';
+        $percentConvertedSuffix = null;
+        $percentConvertedDescription = null;
+
+        if ($activeTab !== 'active') {
+            $percentConverted = $totalValidEstimatesCount > 0
+                ? Number::percentage(($totalConvertedCount / $totalValidEstimatesCount) * 100, maxPrecision: 1)
+                : Number::percentage(0, maxPrecision: 1);
+
+            $percentConvertedSuffix = 'converted';
+            $percentConvertedDescription = $totalConvertedCount . ' converted';
+        }
+
         return [
             EnhancedStatsOverviewWidget\EnhancedStat::make('Active Estimates', CurrencyConverter::formatCentsToMoney($totalActiveAmount))
                 ->suffix(CurrencyAccessor::getDefaultCurrency())
@@ -60,11 +92,12 @@ class EstimateOverview extends EnhancedStatsOverviewWidget
                 ->description($totalAcceptedCount . ' accepted'),
 
             EnhancedStatsOverviewWidget\EnhancedStat::make('Converted Estimates', $percentConverted)
-                ->suffix('converted')
-                ->description($totalConvertedCount . ' converted'),
+                ->suffix($percentConvertedSuffix)
+                ->description($percentConvertedDescription),
 
             EnhancedStatsOverviewWidget\EnhancedStat::make('Average Estimate Total', CurrencyConverter::formatCentsToMoney($averageEstimateTotal))
-                ->suffix(CurrencyAccessor::getDefaultCurrency()),
+                ->suffix(CurrencyAccessor::getDefaultCurrency())
+                ->description($activeTab === 'all' ? 'Excludes draft estimates' : null),
         ];
     }
 }

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

@@ -3,14 +3,17 @@
 namespace App\Filament\Company\Resources\Sales;
 
 use App\Collections\Accounting\DocumentCollection;
+use App\Enums\Accounting\AdjustmentCategory;
+use App\Enums\Accounting\AdjustmentStatus;
+use App\Enums\Accounting\AdjustmentType;
 use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\DocumentType;
 use App\Enums\Accounting\InvoiceStatus;
 use App\Enums\Accounting\PaymentMethod;
 use App\Filament\Company\Resources\Sales\ClientResource\RelationManagers\InvoicesRelationManager;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
-use App\Filament\Company\Resources\Sales\InvoiceResource\RelationManagers;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Widgets;
+use App\Filament\Forms\Components\CreateAdjustmentSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\DocumentFooterSection;
 use App\Filament\Forms\Components\DocumentHeaderSection;
@@ -19,6 +22,7 @@ use App\Filament\Tables\Actions\ReplicateBulkAction;
 use App\Filament\Tables\Columns;
 use App\Filament\Tables\Filters\DateRangeFilter;
 use App\Models\Accounting\Adjustment;
+use App\Models\Accounting\DocumentLineItem;
 use App\Models\Accounting\Invoice;
 use App\Models\Banking\BankAccount;
 use App\Models\Common\Client;
@@ -137,17 +141,17 @@ class InvoiceResource extends Resource
                                     Header::make($settings->resolveColumnLabel('item_name', 'Items'))
                                         ->width($hasDiscounts ? '15%' : '20%'),
                                     Header::make('Description')
-                                        ->width($hasDiscounts ? '25%' : '30%'),
+                                        ->width($hasDiscounts ? '15%' : '20%'),
                                     Header::make($settings->resolveColumnLabel('unit_name', 'Quantity'))
                                         ->width('10%'),
                                     Header::make($settings->resolveColumnLabel('price_name', 'Price'))
                                         ->width('10%'),
                                     Header::make('Taxes')
-                                        ->width($hasDiscounts ? '15%' : '20%'),
+                                        ->width($hasDiscounts ? '20%' : '30%'),
                                 ];
 
                                 if ($hasDiscounts) {
-                                    $headers[] = Header::make('Discounts')->width('15%');
+                                    $headers[] = Header::make('Discounts')->width('20%');
                                 }
 
                                 $headers[] = Header::make($settings->resolveColumnLabel('amount_name', 'Amount'))
@@ -163,9 +167,40 @@ class InvoiceResource extends Resource
                                     ->searchable()
                                     ->required()
                                     ->live()
-                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
                                         $offeringId = $state;
-                                        $offeringRecord = Offering::with(['salesTaxes', 'salesDiscounts'])->find($offeringId);
+                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+                                        $isPerLineItem = $discountMethod->isPerLineItem();
+
+                                        $existingTaxIds = [];
+                                        $existingDiscountIds = [];
+
+                                        if ($record) {
+                                            $existingTaxIds = $record->salesTaxes()->pluck('adjustments.id')->toArray();
+                                            if ($isPerLineItem) {
+                                                $existingDiscountIds = $record->salesDiscounts()->pluck('adjustments.id')->toArray();
+                                            }
+                                        }
+
+                                        $with = [
+                                            'salesTaxes' => static function ($query) use ($existingTaxIds) {
+                                                $query->where(static function ($query) use ($existingTaxIds) {
+                                                    $query->where('status', AdjustmentStatus::Active)
+                                                        ->orWhereIn('adjustments.id', $existingTaxIds);
+                                                });
+                                            },
+                                        ];
+
+                                        if ($isPerLineItem) {
+                                            $with['salesDiscounts'] = static function ($query) use ($existingDiscountIds) {
+                                                $query->where(static function ($query) use ($existingDiscountIds) {
+                                                    $query->where('status', AdjustmentStatus::Active)
+                                                        ->orWhereIn('adjustments.id', $existingDiscountIds);
+                                                });
+                                            };
+                                        }
+
+                                        $offeringRecord = Offering::with($with)->find($offeringId);
 
                                         if (! $offeringRecord) {
                                             return;
@@ -177,8 +212,7 @@ class InvoiceResource extends Resource
                                         $set('unit_price', $unitPrice);
                                         $set('salesTaxes', $offeringRecord->salesTaxes->pluck('id')->toArray());
 
-                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
-                                        if ($discountMethod->isPerLineItem()) {
+                                        if ($isPerLineItem) {
                                             $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
                                         }
                                     }),
@@ -195,19 +229,24 @@ class InvoiceResource extends Resource
                                     ->live()
                                     ->maxValue(9999999999.99)
                                     ->default(0),
-                                Forms\Components\Select::make('salesTaxes')
-                                    ->relationship('salesTaxes', 'name')
+                                CreateAdjustmentSelect::make('salesTaxes')
+                                    ->label('Taxes')
+                                    ->category(AdjustmentCategory::Tax)
+                                    ->type(AdjustmentType::Sales)
+                                    ->adjustmentsRelationship('salesTaxes')
                                     ->saveRelationshipsUsing(null)
                                     ->dehydrated(true)
                                     ->preload()
                                     ->multiple()
                                     ->live()
                                     ->searchable(),
-                                Forms\Components\Select::make('salesDiscounts')
-                                    ->relationship('salesDiscounts', 'name')
+                                CreateAdjustmentSelect::make('salesDiscounts')
+                                    ->label('Discounts')
+                                    ->category(AdjustmentCategory::Discount)
+                                    ->type(AdjustmentType::Sales)
+                                    ->adjustmentsRelationship('salesDiscounts')
                                     ->saveRelationshipsUsing(null)
                                     ->dehydrated(true)
-                                    ->preload()
                                     ->multiple()
                                     ->live()
                                     ->hidden(function (Forms\Get $get) {
@@ -328,10 +367,11 @@ class InvoiceResource extends Resource
                 Tables\Filters\SelectFilter::make('client')
                     ->relationship('client', 'name')
                     ->searchable()
-                    ->preload(),
+                    ->preload()
+                    ->hiddenOn(InvoicesRelationManager::class),
                 Tables\Filters\SelectFilter::make('status')
                     ->options(InvoiceStatus::class)
-                    ->native(false),
+                    ->multiple(),
                 Tables\Filters\TernaryFilter::make('has_payments')
                     ->label('Has payments')
                     ->queries(
@@ -439,9 +479,13 @@ class InvoiceResource extends Resource
                                 Forms\Components\Select::make('bank_account_id')
                                     ->label('Account')
                                     ->required()
-                                    ->options(BankAccount::query()
-                                        ->get()
-                                        ->pluck('account.name', 'id'))
+                                    ->options(function () {
+                                        return BankAccount::query()
+                                            ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
+                                            ->select(['bank_accounts.id', 'accounts.name'])
+                                            ->pluck('accounts.name', 'bank_accounts.id')
+                                            ->toArray();
+                                    })
                                     ->searchable(),
                                 Forms\Components\Textarea::make('notes')
                                     ->label('Notes'),
@@ -605,9 +649,13 @@ class InvoiceResource extends Resource
                             Forms\Components\Select::make('bank_account_id')
                                 ->label('Account')
                                 ->required()
-                                ->options(BankAccount::query()
-                                    ->get()
-                                    ->pluck('account.name', 'id'))
+                                ->options(function () {
+                                    return BankAccount::query()
+                                        ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
+                                        ->select(['bank_accounts.id', 'accounts.name'])
+                                        ->pluck('accounts.name', 'bank_accounts.id')
+                                        ->toArray();
+                                })
                                 ->searchable(),
                             Forms\Components\Textarea::make('notes')
                                 ->label('Notes'),
@@ -656,13 +704,6 @@ class InvoiceResource extends Resource
             ]);
     }
 
-    public static function getRelations(): array
-    {
-        return [
-            RelationManagers\PaymentsRelationManager::class,
-        ];
-    }
-
     public static function getPages(): array
     {
         return [

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

@@ -3,7 +3,7 @@
 namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToListPage;
+use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Models\Accounting\Invoice;
 use App\Models\Common\Client;
@@ -15,7 +15,7 @@ use Livewire\Attributes\Url;
 class CreateInvoice extends CreateRecord
 {
     use ManagesLineItems;
-    use RedirectToListPage;
+    use RedirectToViewPage;
 
     protected static string $resource = InvoiceResource::class;
 

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

@@ -3,7 +3,7 @@
 namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToListPage;
+use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Models\Accounting\Invoice;
 use Filament\Actions;
@@ -14,7 +14,7 @@ use Illuminate\Database\Eloquent\Model;
 class EditInvoice extends EditRecord
 {
     use ManagesLineItems;
-    use RedirectToListPage;
+    use RedirectToViewPage;
 
     protected static string $resource = InvoiceResource::class;
 
@@ -30,11 +30,6 @@ class EditInvoice extends EditRecord
         return MaxWidth::Full;
     }
 
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('view', ['record' => $this->record]);
-    }
-
     protected function handleRecordUpdate(Model $record, array $data): Model
     {
         /** @var Invoice $record */

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

@@ -5,6 +5,7 @@ namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 use App\Enums\Accounting\DocumentType;
 use App\Filament\Company\Resources\Sales\ClientResource;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
+use App\Filament\Infolists\Components\BannerEntry;
 use App\Filament\Infolists\Components\DocumentPreview;
 use App\Models\Accounting\Invoice;
 use Filament\Actions;
@@ -17,6 +18,7 @@ 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
 {
@@ -60,6 +62,31 @@ class ViewInvoice extends ViewRecord
     {
         return $infolist
             ->schema([
+                BannerEntry::make('inactiveAdjustments')
+                    ->label('Inactive adjustments')
+                    ->warning()
+                    ->icon('heroicon-o-exclamation-triangle')
+                    ->visible(fn (Invoice $record) => $record->hasInactiveAdjustments() && $record->canBeApproved())
+                    ->columnSpanFull()
+                    ->description(function (Invoice $record) {
+                        $inactiveAdjustments = collect();
+
+                        foreach ($record->lineItems as $lineItem) {
+                            foreach ($lineItem->adjustments as $adjustment) {
+                                if ($adjustment->isInactive() && $inactiveAdjustments->doesntContain($adjustment->name)) {
+                                    $inactiveAdjustments->push($adjustment->name);
+                                }
+                            }
+                        }
+
+                        $adjustmentsList = $inactiveAdjustments->map(static function ($name) {
+                            return "<span class='font-medium'>{$name}</span>";
+                        })->join(', ');
+
+                        $output = "<p class='text-sm'>This invoice contains inactive adjustments that need to be addressed before approval: {$adjustmentsList}</p>";
+
+                        return new HtmlString($output);
+                    }),
                 Section::make('Invoice Details')
                     ->columns(4)
                     ->schema([
@@ -98,4 +125,11 @@ class ViewInvoice extends ViewRecord
                     ]),
             ]);
     }
+
+    protected function getAllRelationManagers(): array
+    {
+        return [
+            InvoiceResource\RelationManagers\PaymentsRelationManager::class,
+        ];
+    }
 }

app/Filament/Company/Resources/Sales/InvoiceResource/RelationManagers/PaymentsRelationManager.php

@@ -5,7 +5,6 @@ namespace App\Filament\Company\Resources\Sales\InvoiceResource\RelationManagers;
 use App\Enums\Accounting\InvoiceStatus;
 use App\Enums\Accounting\PaymentMethod;
 use App\Enums\Accounting\TransactionType;
-use App\Filament\Company\Resources\Sales\InvoiceResource\Pages\ViewInvoice;
 use App\Models\Accounting\Invoice;
 use App\Models\Accounting\Transaction;
 use App\Models\Banking\BankAccount;
@@ -41,7 +40,7 @@ class PaymentsRelationManager extends RelationManager
 
     public static function canViewForRecord(Model $ownerRecord, string $pageClass): bool
     {
-        return $ownerRecord->status !== InvoiceStatus::Draft && $pageClass === ViewInvoice::class;
+        return $ownerRecord->status !== InvoiceStatus::Draft;
     }
 
     public function form(Form $form): Form
@@ -51,59 +50,143 @@ class PaymentsRelationManager extends RelationManager
             ->schema([
                 Forms\Components\DatePicker::make('posted_at')
                     ->label('Date'),
-                Forms\Components\TextInput::make('amount')
-                    ->label('Amount')
-                    ->required()
-                    ->money()
-                    ->live(onBlur: true)
-                    ->helperText(function (RelationManager $livewire, $state, ?Transaction $record) {
-                        if (! CurrencyConverter::isValidAmount($state)) {
+                Forms\Components\Grid::make()
+                    ->schema([
+                        Forms\Components\Select::make('bank_account_id')
+                            ->label('Account')
+                            ->required()
+                            ->live()
+                            ->options(function () {
+                                return BankAccount::query()
+                                    ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
+                                    ->select(['bank_accounts.id', 'accounts.name', 'accounts.currency_code'])
+                                    ->get()
+                                    ->mapWithKeys(function ($account) {
+                                        $label = $account->name;
+                                        if ($account->currency_code) {
+                                            $label .= " ({$account->currency_code})";
+                                        }
+
+                                        return [$account->id => $label];
+                                    })
+                                    ->toArray();
+                            })
+                            ->searchable(),
+                        Forms\Components\TextInput::make('amount')
+                            ->label('Amount')
+                            ->required()
+                            ->money(function (RelationManager $livewire) {
+                                /** @var Invoice $invoice */
+                                $invoice = $livewire->getOwnerRecord();
+
+                                return $invoice->currency_code;
+                            })
+                            ->live(onBlur: true)
+                            ->helperText(function (RelationManager $livewire, $state, ?Transaction $record) {
+                                /** @var Invoice $ownerRecord */
+                                $ownerRecord = $livewire->getOwnerRecord();
+
+                                $invoiceCurrency = $ownerRecord->currency_code;
+
+                                if (! CurrencyConverter::isValidAmount($state, $invoiceCurrency)) {
+                                    return null;
+                                }
+
+                                $amountDue = $ownerRecord->getRawOriginal('amount_due');
+
+                                $amount = CurrencyConverter::convertToCents($state, $invoiceCurrency);
+
+                                if ($amount <= 0) {
+                                    return 'Please enter a valid positive amount';
+                                }
+
+                                $currentPaymentAmount = $record?->getRawOriginal('amount') ?? 0;
+
+                                if ($ownerRecord->status === InvoiceStatus::Overpaid) {
+                                    $newAmountDue = $amountDue + $amount - $currentPaymentAmount;
+                                } else {
+                                    $newAmountDue = $amountDue - $amount + $currentPaymentAmount;
+                                }
+
+                                return match (true) {
+                                    $newAmountDue > 0 => 'Amount due after payment will be ' . CurrencyConverter::formatCentsToMoney($newAmountDue, $invoiceCurrency),
+                                    $newAmountDue === 0 => 'Invoice will be fully paid',
+                                    default => 'Invoice will be overpaid by ' . CurrencyConverter::formatCentsToMoney(abs($newAmountDue), $invoiceCurrency),
+                                };
+                            })
+                            ->rules([
+                                static fn (RelationManager $livewire): Closure => static function (string $attribute, $value, Closure $fail) use ($livewire) {
+                                    /** @var Invoice $invoice */
+                                    $invoice = $livewire->getOwnerRecord();
+
+                                    if (! CurrencyConverter::isValidAmount($value, $invoice->currency_code)) {
+                                        $fail('Please enter a valid amount');
+                                    }
+                                },
+                            ]),
+                    ])->columns(2),
+                Forms\Components\Placeholder::make('currency_conversion')
+                    ->label('Currency Conversion')
+                    ->content(function (Forms\Get $get, RelationManager $livewire) {
+                        $amount = $get('amount');
+                        $bankAccountId = $get('bank_account_id');
+
+                        /** @var Invoice $invoice */
+                        $invoice = $livewire->getOwnerRecord();
+                        $invoiceCurrency = $invoice->currency_code;
+
+                        if (empty($amount) || empty($bankAccountId) || ! CurrencyConverter::isValidAmount($amount, $invoiceCurrency)) {
+                            return null;
+                        }
+
+                        $bankAccount = BankAccount::with('account')->find($bankAccountId);
+                        if (! $bankAccount) {
                             return null;
                         }
 
-                        /** @var Invoice $ownerRecord */
-                        $ownerRecord = $livewire->getOwnerRecord();
+                        $bankCurrency = $bankAccount->account->currency_code ?? CurrencyAccessor::getDefaultCurrency();
+
+                        // If currencies are the same, no conversion needed
+                        if ($invoiceCurrency === $bankCurrency) {
+                            return null;
+                        }
 
-                        $amountDue = $ownerRecord->getRawOriginal('amount_due');
+                        // Convert amount from invoice currency to bank currency
+                        $amountInInvoiceCurrencyCents = CurrencyConverter::convertToCents($amount, $invoiceCurrency);
+                        $amountInBankCurrencyCents = CurrencyConverter::convertBalance(
+                            $amountInInvoiceCurrencyCents,
+                            $invoiceCurrency,
+                            $bankCurrency
+                        );
 
-                        $amount = CurrencyConverter::convertToCents($state);
+                        $formattedBankAmount = CurrencyConverter::formatCentsToMoney($amountInBankCurrencyCents, $bankCurrency);
 
-                        if ($amount <= 0) {
-                            return 'Please enter a valid positive amount';
+                        return "Payment will be recorded as {$formattedBankAmount} in the bank account's currency ({$bankCurrency}).";
+                    })
+                    ->hidden(function (Forms\Get $get, RelationManager $livewire) {
+                        $bankAccountId = $get('bank_account_id');
+                        if (empty($bankAccountId)) {
+                            return true;
                         }
 
-                        $currentPaymentAmount = $record?->getRawOriginal('amount') ?? 0;
+                        /** @var Invoice $invoice */
+                        $invoice = $livewire->getOwnerRecord();
+                        $invoiceCurrency = $invoice->currency_code;
 
-                        if ($ownerRecord->status === InvoiceStatus::Overpaid) {
-                            $newAmountDue = $amountDue + $amount - $currentPaymentAmount;
-                        } else {
-                            $newAmountDue = $amountDue - $amount + $currentPaymentAmount;
+                        $bankAccount = BankAccount::with('account')->find($bankAccountId);
+                        if (! $bankAccount) {
+                            return true;
                         }
 
-                        return match (true) {
-                            $newAmountDue > 0 => 'Amount due after payment will be ' . CurrencyConverter::formatCentsToMoney($newAmountDue),
-                            $newAmountDue === 0 => 'Invoice will be fully paid',
-                            default => 'Invoice will be overpaid by ' . CurrencyConverter::formatCentsToMoney(abs($newAmountDue)),
-                        };
-                    })
-                    ->rules([
-                        static fn (): Closure => static function (string $attribute, $value, Closure $fail) {
-                            if (! CurrencyConverter::isValidAmount($value)) {
-                                $fail('Please enter a valid amount');
-                            }
-                        },
-                    ]),
+                        $bankCurrency = $bankAccount->account->currency_code ?? CurrencyAccessor::getDefaultCurrency();
+
+                        // Hide if currencies are the same
+                        return $invoiceCurrency === $bankCurrency;
+                    }),
                 Forms\Components\Select::make('payment_method')
                     ->label('Payment method')
                     ->required()
                     ->options(PaymentMethod::class),
-                Forms\Components\Select::make('bank_account_id')
-                    ->label('Account')
-                    ->required()
-                    ->options(BankAccount::query()
-                        ->get()
-                        ->pluck('account.name', 'id'))
-                    ->searchable(),
                 Forms\Components\Textarea::make('notes')
                     ->label('Notes'),
             ]);

app/Filament/Company/Resources/Sales/InvoiceResource/Widgets/InvoiceOverview.php

@@ -21,6 +21,26 @@ class InvoiceOverview extends EnhancedStatsOverviewWidget
 
     protected function getStats(): array
     {
+        $activeTab = $this->activeTab;
+
+        if ($activeTab === 'draft') {
+            $draftInvoices = $this->getPageTableQuery();
+            $totalDraftCount = $draftInvoices->count();
+            $totalDraftAmount = $draftInvoices->get()->sumMoneyInDefaultCurrency('total');
+
+            $averageDraftTotal = $totalDraftCount > 0
+                ? (int) round($totalDraftAmount / $totalDraftCount)
+                : 0;
+
+            return [
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Total Unpaid', '-'),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Due Within 30 Days', '-'),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Average Payment Time', '-'),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Average Invoice Total', CurrencyConverter::formatCentsToMoney($averageDraftTotal))
+                    ->suffix(CurrencyAccessor::getDefaultCurrency()),
+            ];
+        }
+
         $unpaidInvoices = $this->getPageTableQuery()->unpaid();
 
         $amountUnpaid = $unpaidInvoices->get()->sumMoneyInDefaultCurrency('amount_due');
@@ -51,12 +71,18 @@ class InvoiceOverview extends EnhancedStatsOverviewWidget
             ? (int) round($totalValidInvoiceAmount / $totalValidInvoiceCount)
             : 0;
 
-        $averagePaymentTime = $this->getPageTableQuery()
-            ->whereNotNull('paid_at')
-            ->selectRaw('AVG(TIMESTAMPDIFF(DAY, approved_at, paid_at)) as avg_days')
-            ->value('avg_days');
+        $averagePaymentTimeFormatted = '-';
+        $averagePaymentTimeSuffix = null;
 
-        $averagePaymentTimeFormatted = Number::format($averagePaymentTime ?? 0, maxPrecision: 1);
+        if ($activeTab !== 'unpaid') {
+            $averagePaymentTime = $this->getPageTableQuery()
+                ->whereNotNull('paid_at')
+                ->selectRaw('AVG(TIMESTAMPDIFF(DAY, approved_at, paid_at)) as avg_days')
+                ->value('avg_days');
+
+            $averagePaymentTimeFormatted = Number::format($averagePaymentTime ?? 0, maxPrecision: 1);
+            $averagePaymentTimeSuffix = 'days';
+        }
 
         return [
             EnhancedStatsOverviewWidget\EnhancedStat::make('Total Unpaid', CurrencyConverter::formatCentsToMoney($amountUnpaid))
@@ -65,9 +91,10 @@ class InvoiceOverview extends EnhancedStatsOverviewWidget
             EnhancedStatsOverviewWidget\EnhancedStat::make('Due Within 30 Days', CurrencyConverter::formatCentsToMoney($amountDueWithin30Days))
                 ->suffix(CurrencyAccessor::getDefaultCurrency()),
             EnhancedStatsOverviewWidget\EnhancedStat::make('Average Payment Time', $averagePaymentTimeFormatted)
-                ->suffix('days'),
+                ->suffix($averagePaymentTimeSuffix),
             EnhancedStatsOverviewWidget\EnhancedStat::make('Average Invoice Total', CurrencyConverter::formatCentsToMoney($averageInvoiceTotal))
-                ->suffix(CurrencyAccessor::getDefaultCurrency()),
+                ->suffix(CurrencyAccessor::getDefaultCurrency())
+                ->description($activeTab === 'all' ? 'Excludes draft and voided invoices' : null),
         ];
     }
 }

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

@@ -2,17 +2,23 @@
 
 namespace App\Filament\Company\Resources\Sales;
 
+use App\Enums\Accounting\AdjustmentCategory;
+use App\Enums\Accounting\AdjustmentStatus;
+use App\Enums\Accounting\AdjustmentType;
 use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\DocumentType;
 use App\Enums\Accounting\RecurringInvoiceStatus;
 use App\Enums\Setting\PaymentTerms;
+use App\Filament\Company\Resources\Sales\ClientResource\RelationManagers\RecurringInvoicesRelationManager;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages;
+use App\Filament\Forms\Components\CreateAdjustmentSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\DocumentFooterSection;
 use App\Filament\Forms\Components\DocumentHeaderSection;
 use App\Filament\Forms\Components\DocumentTotals;
 use App\Filament\Tables\Columns;
 use App\Models\Accounting\Adjustment;
+use App\Models\Accounting\DocumentLineItem;
 use App\Models\Accounting\RecurringInvoice;
 use App\Models\Common\Client;
 use App\Models\Common\Offering;
@@ -107,17 +113,17 @@ class RecurringInvoiceResource extends Resource
                                     Header::make($settings->resolveColumnLabel('item_name', 'Items'))
                                         ->width($hasDiscounts ? '15%' : '20%'),
                                     Header::make('Description')
-                                        ->width($hasDiscounts ? '25%' : '30%'),
+                                        ->width($hasDiscounts ? '15%' : '20%'),
                                     Header::make($settings->resolveColumnLabel('unit_name', 'Quantity'))
                                         ->width('10%'),
                                     Header::make($settings->resolveColumnLabel('price_name', 'Price'))
                                         ->width('10%'),
                                     Header::make('Taxes')
-                                        ->width($hasDiscounts ? '15%' : '20%'),
+                                        ->width($hasDiscounts ? '20%' : '30%'),
                                 ];
 
                                 if ($hasDiscounts) {
-                                    $headers[] = Header::make('Discounts')->width('15%');
+                                    $headers[] = Header::make('Discounts')->width('20%');
                                 }
 
                                 $headers[] = Header::make($settings->resolveColumnLabel('amount_name', 'Amount'))
@@ -133,9 +139,40 @@ class RecurringInvoiceResource extends Resource
                                     ->searchable()
                                     ->required()
                                     ->live()
-                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
                                         $offeringId = $state;
-                                        $offeringRecord = Offering::with(['salesTaxes', 'salesDiscounts'])->find($offeringId);
+                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+                                        $isPerLineItem = $discountMethod->isPerLineItem();
+
+                                        $existingTaxIds = [];
+                                        $existingDiscountIds = [];
+
+                                        if ($record) {
+                                            $existingTaxIds = $record->salesTaxes()->pluck('adjustments.id')->toArray();
+                                            if ($isPerLineItem) {
+                                                $existingDiscountIds = $record->salesDiscounts()->pluck('adjustments.id')->toArray();
+                                            }
+                                        }
+
+                                        $with = [
+                                            'salesTaxes' => static function ($query) use ($existingTaxIds) {
+                                                $query->where(static function ($query) use ($existingTaxIds) {
+                                                    $query->where('status', AdjustmentStatus::Active)
+                                                        ->orWhereIn('adjustments.id', $existingTaxIds);
+                                                });
+                                            },
+                                        ];
+
+                                        if ($isPerLineItem) {
+                                            $with['salesDiscounts'] = static function ($query) use ($existingDiscountIds) {
+                                                $query->where(static function ($query) use ($existingDiscountIds) {
+                                                    $query->where('status', AdjustmentStatus::Active)
+                                                        ->orWhereIn('adjustments.id', $existingDiscountIds);
+                                                });
+                                            };
+                                        }
+
+                                        $offeringRecord = Offering::with($with)->find($offeringId);
 
                                         if (! $offeringRecord) {
                                             return;
@@ -147,8 +184,7 @@ class RecurringInvoiceResource extends Resource
                                         $set('unit_price', $unitPrice);
                                         $set('salesTaxes', $offeringRecord->salesTaxes->pluck('id')->toArray());
 
-                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
-                                        if ($discountMethod->isPerLineItem()) {
+                                        if ($isPerLineItem) {
                                             $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
                                         }
                                     }),
@@ -165,19 +201,24 @@ class RecurringInvoiceResource extends Resource
                                     ->live()
                                     ->maxValue(9999999999.99)
                                     ->default(0),
-                                Forms\Components\Select::make('salesTaxes')
-                                    ->relationship('salesTaxes', 'name')
+                                CreateAdjustmentSelect::make('salesTaxes')
+                                    ->label('Taxes')
+                                    ->category(AdjustmentCategory::Tax)
+                                    ->type(AdjustmentType::Sales)
+                                    ->adjustmentsRelationship('salesTaxes')
                                     ->saveRelationshipsUsing(null)
                                     ->dehydrated(true)
                                     ->preload()
                                     ->multiple()
                                     ->live()
                                     ->searchable(),
-                                Forms\Components\Select::make('salesDiscounts')
-                                    ->relationship('salesDiscounts', 'name')
+                                CreateAdjustmentSelect::make('salesDiscounts')
+                                    ->label('Discounts')
+                                    ->category(AdjustmentCategory::Discount)
+                                    ->type(AdjustmentType::Sales)
+                                    ->adjustmentsRelationship('salesDiscounts')
                                     ->saveRelationshipsUsing(null)
                                     ->dehydrated(true)
-                                    ->preload()
                                     ->multiple()
                                     ->live()
                                     ->hidden(function (Forms\Get $get) {
@@ -248,7 +289,8 @@ class RecurringInvoiceResource extends Resource
                     ->searchable(),
                 Tables\Columns\TextColumn::make('client.name')
                     ->sortable()
-                    ->searchable(),
+                    ->searchable()
+                    ->hiddenOn(RecurringInvoicesRelationManager::class),
                 Tables\Columns\TextColumn::make('schedule')
                     ->label('Schedule')
                     ->getStateUsing(function (RecurringInvoice $record) {
@@ -287,7 +329,8 @@ class RecurringInvoiceResource extends Resource
                 Tables\Filters\SelectFilter::make('client')
                     ->relationship('client', 'name')
                     ->searchable()
-                    ->preload(),
+                    ->preload()
+                    ->hiddenOn(RecurringInvoicesRelationManager::class),
                 Tables\Filters\SelectFilter::make('status')
                     ->options(RecurringInvoiceStatus::class)
                     ->native(false),

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

@@ -3,6 +3,7 @@
 namespace App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages;
 
 use App\Concerns\ManagesLineItems;
+use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource;
 use App\Models\Accounting\Estimate;
 use Filament\Actions;
@@ -13,6 +14,7 @@ use Illuminate\Database\Eloquent\Model;
 class EditRecurringInvoice extends EditRecord
 {
     use ManagesLineItems;
+    use RedirectToViewPage;
 
     protected static string $resource = RecurringInvoiceResource::class;
 
@@ -28,11 +30,6 @@ class EditRecurringInvoice extends EditRecord
         return MaxWidth::Full;
     }
 
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('view', ['record' => $this->record]);
-    }
-
     protected function handleRecordUpdate(Model $record, array $data): Model
     {
         /** @var Estimate $record */

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

@@ -20,6 +20,7 @@ use Filament\Support\Enums\FontWeight;
 use Filament\Support\Enums\IconPosition;
 use Filament\Support\Enums\IconSize;
 use Filament\Support\Enums\MaxWidth;
+use Illuminate\Support\HtmlString;
 use Illuminate\Support\Str;
 
 class ViewRecurringInvoice extends ViewRecord
@@ -59,6 +60,31 @@ class ViewRecurringInvoice extends ViewRecord
     {
         return $infolist
             ->schema([
+                BannerEntry::make('inactiveAdjustments')
+                    ->label('Inactive adjustments')
+                    ->warning()
+                    ->icon('heroicon-o-exclamation-triangle')
+                    ->visible(fn (RecurringInvoice $record) => $record->hasInactiveAdjustments() && $record->canBeApproved())
+                    ->columnSpanFull()
+                    ->description(function (RecurringInvoice $record) {
+                        $inactiveAdjustments = collect();
+
+                        foreach ($record->lineItems as $lineItem) {
+                            foreach ($lineItem->adjustments as $adjustment) {
+                                if ($adjustment->isInactive() && $inactiveAdjustments->doesntContain($adjustment->name)) {
+                                    $inactiveAdjustments->push($adjustment->name);
+                                }
+                            }
+                        }
+
+                        $adjustmentsList = $inactiveAdjustments->map(static function ($name) {
+                            return "<span class='font-medium'>{$name}</span>";
+                        })->join(', ');
+
+                        $output = "<p class='text-sm'>This recurring invoice contains inactive adjustments that need to be addressed before approval: {$adjustmentsList}</p>";
+
+                        return new HtmlString($output);
+                    }),
                 BannerEntry::make('scheduleIsNotSet')
                     ->info()
                     ->title('Schedule not set')
@@ -73,7 +99,7 @@ class ViewRecurringInvoice extends ViewRecord
                     ->info()
                     ->title('Ready to Approve')
                     ->description('This recurring invoice is ready for approval. Review the details, and approve it when you’re ready to start generating invoices.')
-                    ->visible(fn (RecurringInvoice $record) => $record->canBeApproved())
+                    ->visible(fn (RecurringInvoice $record) => $record->canBeApproved() && ! $record->hasInactiveAdjustments())
                     ->columnSpanFull()
                     ->actions([
                         RecurringInvoice::getApproveDraftAction(Action::class)

app/Filament/Forms/Components/CreateAccountSelect.php

@@ -0,0 +1,167 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use App\Enums\Accounting\AccountCategory;
+use App\Enums\Accounting\AccountType;
+use App\Models\Accounting\Account;
+use App\Models\Accounting\AccountSubtype;
+use App\Utilities\Accounting\AccountCode;
+use Filament\Forms\Components\Actions\Action;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\Textarea;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Get;
+use Filament\Forms\Set;
+use Filament\Support\Enums\MaxWidth;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+
+class CreateAccountSelect extends Select
+{
+    protected ?AccountCategory $category = null;
+
+    protected ?AccountType $type = null;
+
+    protected bool $includeArchived = false;
+
+    public function category(AccountCategory $category): static
+    {
+        $this->category = $category;
+
+        return $this;
+    }
+
+    public function type(AccountType $type): static
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    public function includeArchived(bool $includeArchived = true): static
+    {
+        $this->includeArchived = $includeArchived;
+
+        return $this;
+    }
+
+    public function getCategory(): ?AccountCategory
+    {
+        return $this->category;
+    }
+
+    public function getType(): ?AccountType
+    {
+        return $this->type;
+    }
+
+    public function includesArchived(): bool
+    {
+        return $this->includeArchived;
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this
+            ->searchable()
+            ->live()
+            ->createOptionForm($this->createAccountForm())
+            ->createOptionAction(fn (Action $action) => $this->createAccountAction($action));
+
+        $this->options(function () {
+            $query = Account::query();
+
+            if ($this->getCategory()) {
+                $query->where('category', $this->getCategory());
+            }
+
+            if ($this->getType()) {
+                $query->where('type', $this->getType());
+            }
+
+            if (! $this->includesArchived()) {
+                $query->where('archived', false);
+            }
+
+            return $query->orderBy('name')
+                ->pluck('name', 'id')
+                ->toArray();
+        });
+
+        $this->createOptionUsing(static function (array $data) {
+            return DB::transaction(static function () use ($data) {
+                $account = Account::create([
+                    'name' => $data['name'],
+                    'code' => $data['code'],
+                    'description' => $data['description'] ?? null,
+                    'subtype_id' => $data['subtype_id'],
+                ]);
+
+                return $account->getKey();
+            });
+        });
+    }
+
+    protected function createAccountForm(): array
+    {
+        return [
+            Select::make('subtype_id')
+                ->label('Type')
+                ->required()
+                ->live()
+                ->searchable()
+                ->options(function () {
+                    $query = AccountSubtype::query()->orderBy('name');
+
+                    if ($this->getCategory()) {
+                        $query->where('category', $this->getCategory());
+                    }
+
+                    if ($this->getType()) {
+                        $query->where('type', $this->getType());
+
+                        return $query->pluck('name', 'id')
+                            ->toArray();
+                    } else {
+                        return $query->get()
+                            ->groupBy(fn (AccountSubtype $subtype) => $subtype->type->getLabel())
+                            ->map(fn (Collection $subtypes, string $type) => $subtypes->mapWithKeys(static fn (AccountSubtype $subtype) => [$subtype->id => $subtype->name]))
+                            ->toArray();
+                    }
+                })
+                ->afterStateUpdated(function (string $state, Set $set) {
+                    if ($state) {
+                        $accountSubtype = AccountSubtype::find($state);
+                        $generatedCode = AccountCode::generate($accountSubtype);
+                        $set('code', $generatedCode);
+                    }
+                }),
+
+            TextInput::make('code')
+                ->label('Code')
+                ->required()
+                ->validationAttribute('account code')
+                ->unique(table: Account::class, column: 'code')
+                ->validateAccountCode(static fn (Get $get) => $get('subtype_id')),
+
+            TextInput::make('name')
+                ->label('Name')
+                ->required(),
+
+            Textarea::make('description')
+                ->label('Description'),
+        ];
+    }
+
+    protected function createAccountAction(Action $action): Action
+    {
+        return $action
+            ->label('Create Account')
+            ->slideOver()
+            ->modalWidth(MaxWidth::Large)
+            ->modalHeading('Create a new account');
+    }
+}

app/Filament/Forms/Components/CreateAdjustmentSelect.php

@@ -0,0 +1,222 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use App\Enums\Accounting\AdjustmentCategory;
+use App\Enums\Accounting\AdjustmentComputation;
+use App\Enums\Accounting\AdjustmentScope;
+use App\Enums\Accounting\AdjustmentStatus;
+use App\Enums\Accounting\AdjustmentType;
+use App\Models\Accounting\Adjustment;
+use Filament\Forms\Components\Actions\Action;
+use Filament\Forms\Components\Checkbox;
+use Filament\Forms\Components\DateTimePicker;
+use Filament\Forms\Components\Group;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\Textarea;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Get;
+use Filament\Support\Enums\MaxWidth;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
+
+class CreateAdjustmentSelect extends Select
+{
+    protected ?AdjustmentCategory $category = null;
+
+    protected ?AdjustmentType $type = null;
+
+    protected bool $includeInactive = false;
+
+    protected string $adjustmentsRelationship = 'adjustments';
+
+    public function category(AdjustmentCategory $category): static
+    {
+        $this->category = $category;
+
+        return $this;
+    }
+
+    public function type(AdjustmentType $type): static
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    public function includeInactive(bool $includeInactive = true): static
+    {
+        $this->includeInactive = $includeInactive;
+
+        return $this;
+    }
+
+    public function adjustmentsRelationship(string $relationship): static
+    {
+        $this->adjustmentsRelationship = $relationship;
+
+        return $this;
+    }
+
+    public function getCategory(): ?AdjustmentCategory
+    {
+        return $this->category;
+    }
+
+    public function getType(): ?AdjustmentType
+    {
+        return $this->type;
+    }
+
+    public function includesInactive(): bool
+    {
+        return $this->includeInactive;
+    }
+
+    public function getAdjustmentsRelationship(): string
+    {
+        return $this->adjustmentsRelationship;
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this
+            ->searchable()
+            ->preload()
+            ->createOptionForm($this->createAdjustmentForm())
+            ->createOptionAction(fn (Action $action) => $this->createAdjustmentAction($action));
+
+        $this->relationship(
+            name: $this->getAdjustmentsRelationship(),
+            titleAttribute: 'name',
+            modifyQueryUsing: function (Builder $query, ?Model $record) {
+                if ($this->getCategory()) {
+                    $query->where('category', $this->getCategory());
+                }
+
+                if ($this->getType()) {
+                    $query->where('type', $this->getType());
+                }
+
+                if (! $this->includesInactive()) {
+                    $existingAdjustmentIds = $record?->{$this->getAdjustmentsRelationship()}()
+                        ->pluck('adjustments.id')
+                        ->toArray() ?? [];
+
+                    $query->where(function ($query) use ($existingAdjustmentIds) {
+                        $query->where('status', AdjustmentStatus::Active)
+                            ->orWhereIn('adjustments.id', $existingAdjustmentIds);
+                    });
+                }
+
+                return $query->orderBy('name');
+            },
+        );
+
+        $this->createOptionUsing(static function (array $data, CreateAdjustmentSelect $component) {
+            return DB::transaction(static function () use ($data, $component) {
+                $category = $data['category'] ?? $component->getCategory();
+                $type = $data['type'] ?? $component->getType();
+
+                $adjustment = Adjustment::create([
+                    'name' => $data['name'],
+                    'description' => $data['description'] ?? null,
+                    'category' => $category,
+                    'type' => $type,
+                    'computation' => $data['computation'],
+                    'rate' => $data['rate'],
+                    'scope' => $data['scope'] ?? null,
+                    'recoverable' => $data['recoverable'] ?? false,
+                    'start_date' => $data['start_date'] ?? null,
+                    'end_date' => $data['end_date'] ?? null,
+                ]);
+
+                return $adjustment->getKey();
+            });
+        });
+    }
+
+    protected function createAdjustmentForm(): array
+    {
+        return [
+            TextInput::make('name')
+                ->label('Name')
+                ->required()
+                ->maxLength(255),
+
+            Textarea::make('description')
+                ->label('Description'),
+
+            Select::make('category')
+                ->label('Category')
+                ->options(AdjustmentCategory::class)
+                ->default(AdjustmentCategory::Tax)
+                ->hidden(fn () => (bool) $this->getCategory())
+                ->live()
+                ->required(),
+
+            Select::make('type')
+                ->label('Type')
+                ->options(AdjustmentType::class)
+                ->default(AdjustmentType::Sales)
+                ->hidden(fn () => (bool) $this->getType())
+                ->live()
+                ->required(),
+
+            Select::make('computation')
+                ->label('Computation')
+                ->options(AdjustmentComputation::class)
+                ->default(AdjustmentComputation::Percentage)
+                ->live()
+                ->required(),
+
+            TextInput::make('rate')
+                ->label('Rate')
+                ->rate(static fn (Get $get) => $get('computation'))
+                ->required(),
+
+            Select::make('scope')
+                ->label('Scope')
+                ->options(AdjustmentScope::class),
+
+            Checkbox::make('recoverable')
+                ->label('Recoverable')
+                ->default(false)
+                ->helperText('When enabled, tax is tracked separately as claimable from the government. Non-recoverable taxes are treated as part of the expense.')
+                ->visible(function (Get $get) {
+                    $category = $this->getCategory() ?? AdjustmentCategory::parse($get('category'));
+                    $type = $this->getType() ?? AdjustmentType::parse($get('type'));
+
+                    return $category->isTax() && $type->isPurchase();
+                }),
+
+            Group::make()
+                ->schema([
+                    DateTimePicker::make('start_date'),
+                    DateTimePicker::make('end_date')
+                        ->after('start_date'),
+                ])
+                ->visible(function (Get $get) {
+                    $category = $this->getCategory() ?? AdjustmentCategory::parse($get('category'));
+
+                    return $category->isDiscount();
+                }),
+        ];
+    }
+
+    protected function createAdjustmentAction(Action $action): Action
+    {
+        $categoryLabel = $this->getCategory()?->getLabel() ?? 'Adjustment';
+        $typeLabel = $this->getType()?->getLabel() ?? '';
+        $label = trim($typeLabel . ' ' . $categoryLabel);
+
+        return $action
+            ->label('Create ' . $label)
+            ->slideOver()
+            ->modalWidth(MaxWidth::ExtraLarge)
+            ->modalHeading('Create a new ' . strtolower($label));
+    }
+}

app/Filament/Forms/Components/CustomTableRepeater.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use Awcodes\TableRepeater\Components\TableRepeater;
+use Closure;
+
+class CustomTableRepeater extends TableRepeater
+{
+    protected bool | Closure | null $spreadsheet = null;
+
+    public function spreadsheet(bool | Closure $condition = true): static
+    {
+        $this->spreadsheet = $condition;
+
+        return $this;
+    }
+
+    public function isSpreadsheet(): bool
+    {
+        return $this->evaluate($this->spreadsheet) ?? false;
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->extraAttributes(function (): array {
+            $attributes = [];
+
+            if ($this->isSpreadsheet()) {
+                $attributes['class'] = 'is-spreadsheet';
+            }
+
+            return $attributes;
+        });
+    }
+}

app/Filament/Forms/Components/LinearWizard.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use Filament\Forms\Components\Wizard;
+
+class LinearWizard extends Wizard
+{
+    protected string $view = 'filament.forms.components.linear-wizard';
+
+    protected bool $hideStepTabs = false;
+
+    protected ?string $currentStepDescription = null;
+
+    /**
+     * Hide the step tabs at the top of the wizard
+     */
+    public function hideStepTabs(bool $condition = true): static
+    {
+        $this->hideStepTabs = $condition;
+
+        return $this;
+    }
+
+    /**
+     * Add a description for the current step
+     */
+    public function currentStepDescription(?string $description): static
+    {
+        $this->currentStepDescription = $description;
+
+        return $this;
+    }
+
+    /**
+     * Get whether the step tabs should be hidden
+     */
+    public function areStepTabsHidden(): bool
+    {
+        return $this->hideStepTabs;
+    }
+
+    /**
+     * Get the description for the current step
+     */
+    public function getCurrentStepDescription(): ?string
+    {
+        return $this->currentStepDescription;
+    }
+}

app/Filament/Tables/Columns/DeferredTextInputColumn.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Filament\Tables\Columns;
+
+use Closure;
+use Filament\Tables\Columns\TextInputColumn;
+
+class DeferredTextInputColumn extends TextInputColumn
+{
+    protected string $view = 'filament.tables.columns.deferred-text-input-column';
+
+    protected bool | Closure $batchMode = false;
+
+    public function batchMode(bool | Closure $condition = true): static
+    {
+        $this->batchMode = $condition;
+
+        return $this;
+    }
+
+    public function getBatchMode(): bool
+    {
+        return $this->evaluate($this->batchMode);
+    }
+}

app/Listeners/CreateConnectedAccount.php

@@ -57,7 +57,7 @@ class CreateConnectedAccount
 
     public function processConnectedBankAccount($plaidAccount, Company $company, Institution $institution, $authResponse, $accessToken): void
     {
-        $identifierHash = md5($institution->external_institution_id . $plaidAccount->name . $plaidAccount->mask);
+        $identifierHash = md5($company->id . $institution->external_institution_id . $plaidAccount->name . $plaidAccount->mask);
 
         $company->connectedBankAccounts()->updateOrCreate([
             'identifier' => $identifierHash,

app/Listeners/SyncWithCompanyDefaults.php

@@ -34,7 +34,7 @@ class SyncWithCompanyDefaults
             return;
         }
 
-        $companyId = auth()->user()->currentCompany->id;
+        $companyId = auth()->user()->current_company_id;
 
         if (! $companyId) {
             return;
@@ -47,6 +47,7 @@ class SyncWithCompanyDefaults
     {
         $modelName = class_basename($model);
 
+        /** @var CompanyDefault $default */
         $default = CompanyDefault::firstOrNew([
             'company_id' => $companyId,
         ]);

app/Livewire/Company/Service/ConnectedAccount/ListInstitutions.php

@@ -108,14 +108,15 @@ class ListInstitutions extends Component implements HasActions, HasForms
         $options = ['new' => 'New Account'];
 
         if ($institutionId) {
-            $options += BankAccount::query()
-                ->where('company_id', $this->user->currentCompany->id)
-                ->where('institution_id', $institutionId)
+            $accountOptions = BankAccount::query()
+                ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
+                ->where('bank_accounts.institution_id', $institutionId)
                 ->whereDoesntHave('connectedBankAccount')
-                ->with('account')
-                ->get()
-                ->pluck('account.name', 'id')
+                ->select(['bank_accounts.id', 'accounts.name'])
+                ->pluck('accounts.name', 'bank_accounts.id')
                 ->toArray();
+
+            $options += $accountOptions;
         }
 
         return $options;

app/Models/Accounting/Account.php

@@ -10,8 +10,10 @@ use App\Facades\Accounting;
 use App\Models\Banking\BankAccount;
 use App\Models\Setting\Currency;
 use App\Observers\AccountObserver;
+use App\Utilities\Currency\CurrencyAccessor;
 use Database\Factories\Accounting\AccountFactory;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -19,7 +21,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
-use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\DB;
 
 #[ObservedBy(AccountObserver::class)]
 class Account extends Model
@@ -84,17 +86,39 @@ class Account extends Model
         return $this->hasOne(Adjustment::class, 'account_id');
     }
 
-    public function getLastTransactionDate(): ?string
-    {
-        $lastJournalEntryTransaction = $this->journalEntries()
-            ->join('transactions', 'journal_entries.transaction_id', '=', 'transactions.id')
-            ->max('transactions.posted_at');
-
-        if ($lastJournalEntryTransaction) {
-            return Carbon::parse($lastJournalEntryTransaction)->format('F j, Y');
-        }
-
-        return null;
+    public function scopeBudgetable(Builder $query): Builder
+    {
+        return $query->whereIn('category', [
+            AccountCategory::Revenue,
+            AccountCategory::Expense,
+        ])
+            ->whereNotIn('type', [
+                AccountType::ContraRevenue,
+                AccountType::ContraExpense,
+                AccountType::UncategorizedRevenue,
+                AccountType::UncategorizedExpense,
+            ])
+            ->whereDoesntHave('subtype', function (Builder $query) {
+                $query->whereIn('name', [
+                    'Receivables',
+                    'Input Tax Recoverable',
+                ]);
+            })
+            ->whereNotIn('name', [
+                'Gain on Foreign Exchange',
+                'Loss on Foreign Exchange',
+            ])
+            ->where('currency_code', CurrencyAccessor::getDefaultCurrency());
+    }
+
+    public function scopeWithLastTransactionDate(Builder $query): Builder
+    {
+        return $query->addSelect([
+            'last_transaction_date' => JournalEntry::select(DB::raw('MAX(transactions.posted_at)'))
+                ->join('transactions', 'journal_entries.transaction_id', '=', 'transactions.id')
+                ->whereColumn('journal_entries.account_id', 'accounts.id')
+                ->limit(1),
+        ]);
     }
 
     protected function endingBalance(): Attribute

app/Models/Accounting/Adjustment.php

@@ -8,6 +8,7 @@ use App\Concerns\CompanyOwned;
 use App\Enums\Accounting\AdjustmentCategory;
 use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Accounting\AdjustmentScope;
+use App\Enums\Accounting\AdjustmentStatus;
 use App\Enums\Accounting\AdjustmentType;
 use App\Models\Common\Offering;
 use App\Observers\AdjustmentObserver;
@@ -26,12 +27,12 @@ class Adjustment extends Model
     use CompanyOwned;
     use HasFactory;
 
-    protected $table = 'adjustments';
-
     protected $fillable = [
         'company_id',
         'account_id',
         'name',
+        'status',
+        'status_reason',
         'description',
         'category',
         'type',
@@ -41,11 +42,15 @@ class Adjustment extends Model
         'scope',
         'start_date',
         'end_date',
+        'paused_at',
+        'paused_until',
+        'archived_at',
         'created_by',
         'updated_by',
     ];
 
     protected $casts = [
+        'status' => AdjustmentStatus::class,
         'category' => AdjustmentCategory::class,
         'type' => AdjustmentType::class,
         'recoverable' => 'boolean',
@@ -54,6 +59,9 @@ class Adjustment extends Model
         'scope' => AdjustmentScope::class,
         'start_date' => 'datetime',
         'end_date' => 'datetime',
+        'paused_at' => 'datetime',
+        'paused_until' => 'datetime',
+        'archived_at' => 'datetime',
     ];
 
     public function account(): BelongsTo
@@ -91,6 +99,118 @@ class Adjustment extends Model
         return $this->category->isDiscount() && $this->type->isPurchase();
     }
 
+    public function isActive(): bool
+    {
+        return $this->status === AdjustmentStatus::Active;
+    }
+
+    public function isInactive(): bool
+    {
+        return ! $this->isActive();
+    }
+
+    public function canBePaused(): bool
+    {
+        return $this->status === AdjustmentStatus::Active;
+    }
+
+    public function canBeResumed(): bool
+    {
+        return $this->status === AdjustmentStatus::Paused;
+    }
+
+    public function canBeArchived(): bool
+    {
+        return $this->status !== AdjustmentStatus::Archived;
+    }
+
+    public function calculateNaturalStatus(): AdjustmentStatus
+    {
+        if ($this->start_date?->isFuture()) {
+            return AdjustmentStatus::Upcoming;
+        }
+
+        if ($this->end_date?->isPast()) {
+            return AdjustmentStatus::Expired;
+        }
+
+        return AdjustmentStatus::Active;
+    }
+
+    public function pause(?string $reason = null, ?\DateTime $untilDate = null): bool
+    {
+        if (! $this->canBePaused()) {
+            return false;
+        }
+
+        return $this->update([
+            'paused_at' => now(),
+            'paused_until' => $untilDate,
+            'status' => AdjustmentStatus::Paused,
+            'status_reason' => $reason,
+        ]);
+    }
+
+    public function resume(): bool
+    {
+        if (! $this->canBeResumed()) {
+            return false;
+        }
+
+        return $this->update([
+            'paused_at' => null,
+            'paused_until' => null,
+            'status_reason' => null,
+            'status' => $this->calculateNaturalStatus(),
+        ]);
+    }
+
+    public function archive(?string $reason = null): bool
+    {
+        if (! $this->canBeArchived()) {
+            return false;
+        }
+
+        return $this->update([
+            'archived_at' => now(),
+            'status' => AdjustmentStatus::Archived,
+            'status_reason' => $reason,
+        ]);
+    }
+
+    public function shouldAutoResume(): bool
+    {
+        return $this->status === AdjustmentStatus::Paused &&
+            $this->paused_until !== null &&
+            $this->paused_until->isPast();
+    }
+
+    public function refreshStatus(): bool
+    {
+        // Don't automatically change archived or paused status
+        if ($this->status === AdjustmentStatus::Archived ||
+            ($this->status === AdjustmentStatus::Paused && ! $this->shouldAutoResume())) {
+            return false;
+        }
+
+        // Check if a paused adjustment should be auto-resumed
+        if ($this->shouldAutoResume()) {
+            return $this->resume();
+        }
+
+        // Calculate natural status based on dates
+        $naturalStatus = $this->calculateNaturalStatus();
+
+        // Only update if the status would change
+        if ($this->status !== $naturalStatus) {
+            return $this->update([
+                'status' => $naturalStatus,
+            ]);
+        }
+
+        return false;
+    }
+
     protected static function newFactory(): Factory
     {
         return AdjustmentFactory::new();

app/Models/Accounting/Bill.php

@@ -164,7 +164,7 @@ class Bill extends Document
         return ! in_array($this->status, [
             BillStatus::Paid,
             BillStatus::Void,
-        ]) && $this->currency_code === CurrencyAccessor::getDefaultCurrency();
+        ]);
     }
 
     public function hasPayments(): bool
@@ -227,8 +227,10 @@ class Bill extends Document
         $billCurrency = $this->currency_code;
         $requiresConversion = $billCurrency !== $bankAccountCurrency;
 
+        // Store the original payment amount in bill currency before any conversion
+        $amountInBillCurrencyCents = CurrencyConverter::convertToCents($data['amount'], $billCurrency);
+
         if ($requiresConversion) {
-            $amountInBillCurrencyCents = CurrencyConverter::convertToCents($data['amount'], $billCurrency);
             $amountInBankCurrencyCents = CurrencyConverter::convertBalance(
                 $amountInBillCurrencyCents,
                 $billCurrency,
@@ -254,6 +256,10 @@ class Bill extends Document
             'account_id' => Account::getAccountsPayableAccount()->id,
             'description' => $transactionDescription,
             'notes' => $data['notes'] ?? null,
+            'meta' => [
+                'original_document_currency' => $billCurrency,
+                'amount_in_document_currency_cents' => $amountInBillCurrencyCents,
+            ],
         ]);
     }
 

app/Models/Accounting/Budget.php

@@ -0,0 +1,329 @@
+<?php
+
+namespace App\Models\Accounting;
+
+use App\Concerns\Blamable;
+use App\Concerns\CompanyOwned;
+use App\Enums\Accounting\BudgetIntervalType;
+use App\Enums\Accounting\BudgetSourceType;
+use App\Enums\Accounting\BudgetStatus;
+use App\Filament\Company\Resources\Accounting\BudgetResource;
+use App\Models\User;
+use Filament\Actions\Action;
+use Filament\Actions\MountableAction;
+use Filament\Actions\ReplicateAction;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
+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\HasManyThrough;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
+
+class Budget extends Model
+{
+    use Blamable;
+    use CompanyOwned;
+    use HasFactory;
+
+    protected $fillable = [
+        'company_id',
+        'source_budget_id',
+        'source_fiscal_year',
+        'source_type',
+        'name',
+        'start_date',
+        'end_date',
+        'status', // draft, active, closed
+        'interval_type', // day, week, month, quarter, year
+        'notes',
+        'approved_at',
+        'approved_by_id',
+        'closed_at',
+        'created_by',
+        'updated_by',
+    ];
+
+    protected $casts = [
+        'source_fiscal_year' => 'integer',
+        'source_type' => BudgetSourceType::class,
+        'start_date' => 'date',
+        'end_date' => 'date',
+        'status' => BudgetStatus::class,
+        'interval_type' => BudgetIntervalType::class,
+        'approved_at' => 'datetime',
+        'closed_at' => 'datetime',
+    ];
+
+    public function sourceBudget(): BelongsTo
+    {
+        return $this->belongsTo(self::class, 'source_budget_id');
+    }
+
+    public function derivedBudgets(): HasMany
+    {
+        return $this->hasMany(self::class, 'source_budget_id');
+    }
+
+    public function approvedBy(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'approved_by_id');
+    }
+
+    public function budgetItems(): HasMany
+    {
+        return $this->hasMany(BudgetItem::class);
+    }
+
+    public function allocations(): HasManyThrough
+    {
+        return $this->hasManyThrough(BudgetAllocation::class, BudgetItem::class);
+    }
+
+    public function getPeriods(): Collection
+    {
+        return $this->allocations()
+            ->select(['period', 'start_date'])
+            ->distinct()
+            ->orderBy('start_date')
+            ->get();
+    }
+
+    public function isDraft(): bool
+    {
+        return $this->status === BudgetStatus::Draft;
+    }
+
+    public function isActive(): bool
+    {
+        return $this->status === BudgetStatus::Active;
+    }
+
+    public function isClosed(): bool
+    {
+        return $this->status === BudgetStatus::Closed;
+    }
+
+    public function wasApproved(): bool
+    {
+        return $this->approved_at !== null;
+    }
+
+    public function wasClosed(): bool
+    {
+        return $this->closed_at !== null;
+    }
+
+    public function canBeApproved(): bool
+    {
+        return $this->isDraft() && ! $this->wasApproved();
+    }
+
+    public function canBeClosed(): bool
+    {
+        return $this->isActive() && ! $this->wasClosed();
+    }
+
+    public function hasItems(): bool
+    {
+        return $this->budgetItems()->exists();
+    }
+
+    public function hasAllocations(): bool
+    {
+        return $this->allocations()->exists();
+    }
+
+    public function scopeDraft(Builder $query): Builder
+    {
+        return $query->where('status', BudgetStatus::Draft);
+    }
+
+    public function scopeActive(Builder $query): Builder
+    {
+        return $query->where('status', BudgetStatus::Active);
+    }
+
+    public function scopeClosed(Builder $query): Builder
+    {
+        return $query->where('status', BudgetStatus::Closed);
+    }
+
+    public function scopeCurrentlyActive(Builder $query): Builder
+    {
+        return $query->active()
+            ->where('start_date', '<=', now())
+            ->where('end_date', '>=', now());
+    }
+
+    protected function isCurrentlyInPeriod(): Attribute
+    {
+        return Attribute::get(function () {
+            return now()->between($this->start_date, $this->end_date);
+        });
+    }
+
+    /**
+     * Approve a draft budget
+     */
+    public function approveDraft(?Carbon $approvedAt = null): void
+    {
+        if (! $this->canBeApproved()) {
+            throw new \RuntimeException('Budget cannot be approved.');
+        }
+
+        $approvedAt ??= now();
+
+        $this->update([
+            'status' => BudgetStatus::Active,
+            'approved_at' => $approvedAt,
+        ]);
+    }
+
+    /**
+     * Close an active budget
+     */
+    public function close(?Carbon $closedAt = null): void
+    {
+        if (! $this->canBeClosed()) {
+            throw new \RuntimeException('Budget cannot be closed.');
+        }
+
+        $closedAt ??= now();
+
+        $this->update([
+            'status' => BudgetStatus::Closed,
+            'closed_at' => $closedAt,
+        ]);
+    }
+
+    /**
+     * Reopen a closed budget
+     */
+    public function reopen(): void
+    {
+        if (! $this->isClosed()) {
+            throw new \RuntimeException('Only closed budgets can be reopened.');
+        }
+
+        $this->update([
+            'status' => BudgetStatus::Active,
+            'closed_at' => null,
+        ]);
+    }
+
+    /**
+     * Get Action for approving a draft budget
+     */
+    public static function getApproveDraftAction(string $action = Action::class): MountableAction
+    {
+        return $action::make('approveDraft')
+            ->label('Approve')
+            ->icon('heroicon-m-check-circle')
+            ->visible(function (self $record) {
+                return $record->canBeApproved();
+            })
+            ->databaseTransaction()
+            ->successNotificationTitle('Budget approved')
+            ->action(function (self $record, MountableAction $action) {
+                $record->approveDraft();
+                $action->success();
+            });
+    }
+
+    /**
+     * Get Action for closing an active budget
+     */
+    public static function getCloseAction(string $action = Action::class): MountableAction
+    {
+        return $action::make('close')
+            ->label('Close')
+            ->icon('heroicon-m-lock-closed')
+            ->color('warning')
+            ->visible(function (self $record) {
+                return $record->canBeClosed();
+            })
+            ->requiresConfirmation()
+            ->databaseTransaction()
+            ->successNotificationTitle('Budget closed')
+            ->action(function (self $record, MountableAction $action) {
+                $record->close();
+                $action->success();
+            });
+    }
+
+    /**
+     * Get Action for reopening a closed budget
+     */
+    public static function getReopenAction(string $action = Action::class): MountableAction
+    {
+        return $action::make('reopen')
+            ->label('Reopen')
+            ->icon('heroicon-m-lock-open')
+            ->visible(function (self $record) {
+                return $record->isClosed();
+            })
+            ->requiresConfirmation()
+            ->databaseTransaction()
+            ->successNotificationTitle('Budget reopened')
+            ->action(function (self $record, MountableAction $action) {
+                $record->reopen();
+                $action->success();
+            });
+    }
+
+    /**
+     * Get Action for duplicating a budget
+     */
+    public static function getReplicateAction(string $action = ReplicateAction::class): MountableAction
+    {
+        return $action::make()
+            ->excludeAttributes([
+                'status',
+                'approved_at',
+                'closed_at',
+                'created_by',
+                'updated_by',
+                'created_at',
+                'updated_at',
+            ])
+            ->modal(false)
+            ->beforeReplicaSaved(function (self $original, self $replica) {
+                $replica->status = BudgetStatus::Draft;
+                $replica->name = $replica->name . ' (Copy)';
+            })
+            ->databaseTransaction()
+            ->after(function (self $original, self $replica) {
+                // Clone budget items and their allocations
+                $original->budgetItems->each(function (BudgetItem $item) use ($replica) {
+                    $newItem = $item->replicate([
+                        'budget_id',
+                        'created_by',
+                        'updated_by',
+                        'created_at',
+                        'updated_at',
+                    ]);
+
+                    $newItem->budget_id = $replica->id;
+                    $newItem->save();
+
+                    // Clone the allocations for this budget item
+                    $item->allocations->each(function (BudgetAllocation $allocation) use ($newItem) {
+                        $newAllocation = $allocation->replicate([
+                            'budget_item_id',
+                            'created_at',
+                            'updated_at',
+                        ]);
+
+                        $newAllocation->budget_item_id = $newItem->id;
+                        $newAllocation->save();
+                    });
+                });
+            })
+            ->successRedirectUrl(static function (self $replica) {
+                return BudgetResource::getUrl('edit', ['record' => $replica]);
+            });
+    }
+}

app/Models/Accounting/BudgetAllocation.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Models\Accounting;
+
+use App\Casts\MoneyCast;
+use App\Concerns\CompanyOwned;
+use App\Enums\Accounting\BudgetIntervalType;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class BudgetAllocation extends Model
+{
+    use CompanyOwned;
+    use HasFactory;
+
+    protected $fillable = [
+        'company_id',
+        'budget_item_id',
+        'period',
+        'interval_type',
+        'start_date',
+        'end_date',
+        'amount',
+    ];
+
+    protected $casts = [
+        'start_date' => 'date',
+        'end_date' => 'date',
+        'interval_type' => BudgetIntervalType::class,
+        'amount' => MoneyCast::class,
+    ];
+
+    public function budgetItem(): BelongsTo
+    {
+        return $this->belongsTo(BudgetItem::class);
+    }
+
+    public function isCurrentPeriod(): bool
+    {
+        return now()->between($this->start_date, $this->end_date);
+    }
+}

app/Models/Accounting/BudgetItem.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Models\Accounting;
+
+use App\Concerns\Blamable;
+use App\Concerns\CompanyOwned;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class BudgetItem extends Model
+{
+    use Blamable;
+    use CompanyOwned;
+    use HasFactory;
+
+    protected $fillable = [
+        'company_id',
+        'budget_id',
+        'account_id',
+        'created_by',
+        'updated_by',
+    ];
+
+    public function budget(): BelongsTo
+    {
+        return $this->belongsTo(Budget::class);
+    }
+
+    public function account(): BelongsTo
+    {
+        return $this->belongsTo(Account::class);
+    }
+
+    public function allocations(): HasMany
+    {
+        return $this->hasMany(BudgetAllocation::class);
+    }
+}

app/Models/Accounting/Document.php

@@ -35,6 +35,15 @@ abstract class Document extends Model
         return $this->lineItems()->exists();
     }
 
+    public function hasInactiveAdjustments(): bool
+    {
+        return $this->lineItems->contains(function (DocumentLineItem $lineItem) {
+            return $lineItem->adjustments->contains(function (Adjustment $adjustment) {
+                return $adjustment->isInactive();
+            });
+        });
+    }
+
     public static function getPrintDocumentAction(string $action = Action::class): MountableAction
     {
         return $action::make('printPdf')

app/Models/Accounting/Estimate.php

@@ -19,6 +19,7 @@ use App\Observers\EstimateObserver;
 use Filament\Actions\Action;
 use Filament\Actions\MountableAction;
 use Filament\Actions\ReplicateAction;
+use Filament\Notifications\Notification;
 use Illuminate\Database\Eloquent\Attributes\CollectedBy;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Builder;
@@ -27,6 +28,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Support\Carbon;
+use Livewire\Component;
 
 #[CollectedBy(DocumentCollection::class)]
 #[ObservedBy(EstimateObserver::class)]
@@ -124,7 +126,7 @@ class Estimate extends Document
     protected function isCurrentlyExpired(): Attribute
     {
         return Attribute::get(function () {
-            return $this->expiration_date?->isBefore(today()) && $this->canBeExpired();
+            return $this->expiration_date?->isBefore(today());
         });
     }
 
@@ -170,6 +172,7 @@ class Estimate extends Document
             EstimateStatus::Accepted,
             EstimateStatus::Declined,
             EstimateStatus::Converted,
+            EstimateStatus::Expired,
         ]);
     }
 
@@ -265,12 +268,28 @@ class Estimate extends Document
             ->visible(function (self $record) {
                 return $record->canBeApproved();
             })
+            ->requiresConfirmation()
             ->databaseTransaction()
             ->successNotificationTitle('Estimate approved')
-            ->action(function (self $record, MountableAction $action) {
-                $record->approveDraft();
-
-                $action->success();
+            ->action(function (self $record, MountableAction $action, Component $livewire) {
+                if ($record->hasInactiveAdjustments()) {
+                    $isViewPage = $livewire instanceof EstimateResource\Pages\ViewEstimate;
+
+                    if (! $isViewPage) {
+                        redirect(EstimateResource\Pages\ViewEstimate::getUrl(['record' => $record->id]));
+                    } else {
+                        Notification::make()
+                            ->warning()
+                            ->title('Cannot approve estimate')
+                            ->body('This estimate has inactive adjustments that must be addressed first.')
+                            ->persistent()
+                            ->send();
+                    }
+                } else {
+                    $record->approveDraft();
+
+                    $action->success();
+                }
             });
     }
 

app/Models/Accounting/Invoice.php

@@ -22,6 +22,9 @@ use App\Utilities\Currency\CurrencyConverter;
 use Filament\Actions\Action;
 use Filament\Actions\MountableAction;
 use Filament\Actions\ReplicateAction;
+use Filament\Actions\StaticAction;
+use Filament\Notifications\Notification;
+use Filament\Support\Enums\Alignment;
 use Illuminate\Database\Eloquent\Attributes\CollectedBy;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Builder;
@@ -31,6 +34,8 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\HtmlString;
+use Livewire\Component;
 
 #[CollectedBy(DocumentCollection::class)]
 #[ObservedBy(InvoiceObserver::class)]
@@ -306,8 +311,10 @@ class Invoice extends Document
         $invoiceCurrency = $this->currency_code;
         $requiresConversion = $invoiceCurrency !== $bankAccountCurrency;
 
+        // Store the original payment amount in invoice currency before any conversion
+        $amountInInvoiceCurrencyCents = CurrencyConverter::convertToCents($data['amount'], $invoiceCurrency);
+
         if ($requiresConversion) {
-            $amountInInvoiceCurrencyCents = CurrencyConverter::convertToCents($data['amount'], $invoiceCurrency);
             $amountInBankCurrencyCents = CurrencyConverter::convertBalance(
                 $amountInInvoiceCurrencyCents,
                 $invoiceCurrency,
@@ -333,6 +340,10 @@ class Invoice extends Document
             'account_id' => Account::getAccountsReceivableAccount()->id,
             'description' => $transactionDescription,
             'notes' => $data['notes'] ?? null,
+            'meta' => [
+                'original_document_currency' => $invoiceCurrency,
+                'amount_in_document_currency_cents' => $amountInInvoiceCurrencyCents,
+            ],
         ]);
     }
 
@@ -458,6 +469,45 @@ class Invoice extends Document
         return CurrencyConverter::convertCentsToFormatSimple($convertedCents);
     }
 
+    // TODO: Potentially handle this another way
+    public static function getBlockedApproveAction(string $action = Action::class): MountableAction
+    {
+        return $action::make('blockedApprove')
+            ->label('Approve')
+            ->icon('heroicon-m-check-circle')
+            ->visible(fn (self $record) => $record->canBeApproved() && $record->hasInactiveAdjustments())
+            ->requiresConfirmation()
+            ->modalAlignment(Alignment::Start)
+            ->modalIconColor('danger')
+            ->modalDescription(function (self $record) {
+                $inactiveAdjustments = collect();
+
+                foreach ($record->lineItems as $lineItem) {
+                    foreach ($lineItem->adjustments as $adjustment) {
+                        if ($adjustment->isInactive() && $inactiveAdjustments->doesntContain($adjustment->name)) {
+                            $inactiveAdjustments->push($adjustment->name);
+                        }
+                    }
+                }
+
+                $output = "<p class='text-sm mb-4'>This invoice contains inactive adjustments that need to be addressed before approval:</p>";
+                $output .= "<ul role='list' class='list-disc list-inside space-y-1 text-sm'>";
+
+                foreach ($inactiveAdjustments as $name) {
+                    $output .= "<li class='py-1'><span class='font-medium'>{$name}</span></li>";
+                }
+
+                $output .= '</ul>';
+                $output .= "<p class='text-sm mt-4'>Please update these adjustments before approving the invoice.</p>";
+
+                return new HtmlString($output);
+            })
+            ->modalSubmitAction(function (StaticAction $action, self $record) {
+                $action->label('Edit Invoice')
+                    ->url(InvoiceResource\Pages\EditInvoice::getUrl(['record' => $record->id]));
+            });
+    }
+
     public static function getApproveDraftAction(string $action = Action::class): MountableAction
     {
         return $action::make('approveDraft')
@@ -466,12 +516,28 @@ class Invoice extends Document
             ->visible(function (self $record) {
                 return $record->canBeApproved();
             })
+            ->requiresConfirmation()
             ->databaseTransaction()
             ->successNotificationTitle('Invoice approved')
-            ->action(function (self $record, MountableAction $action) {
-                $record->approveDraft();
+            ->action(function (self $record, MountableAction $action, Component $livewire) {
+                if ($record->hasInactiveAdjustments()) {
+                    $isViewPage = $livewire instanceof InvoiceResource\Pages\ViewInvoice;
+
+                    if (! $isViewPage) {
+                        redirect(InvoiceResource\Pages\ViewInvoice::getUrl(['record' => $record->id]));
+                    } else {
+                        Notification::make()
+                            ->warning()
+                            ->title('Cannot approve invoice')
+                            ->body('This invoice has inactive adjustments that must be addressed first.')
+                            ->persistent()
+                            ->send();
+                    }
+                } else {
+                    $record->approveDraft();
 
-                $action->success();
+                    $action->success();
+                }
             });
     }
 

app/Models/Accounting/RecurringInvoice.php

@@ -17,6 +17,7 @@ use App\Enums\Accounting\InvoiceStatus;
 use App\Enums\Accounting\Month;
 use App\Enums\Accounting\RecurringInvoiceStatus;
 use App\Enums\Setting\PaymentTerms;
+use App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages\ViewRecurringInvoice;
 use App\Filament\Forms\Components\Banner;
 use App\Filament\Forms\Components\CustomSection;
 use App\Models\Common\Client;
@@ -28,6 +29,7 @@ use Filament\Actions\Action;
 use Filament\Actions\MountableAction;
 use Filament\Forms;
 use Filament\Forms\Form;
+use Filament\Notifications\Notification;
 use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Database\Eloquent\Attributes\CollectedBy;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
@@ -35,6 +37,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Carbon;
+use Livewire\Component;
 
 #[CollectedBy(DocumentCollection::class)]
 #[ObservedBy(RecurringInvoiceObserver::class)]
@@ -557,16 +560,32 @@ class RecurringInvoice extends Document
     {
         return $action::make('approveDraft')
             ->label('Approve')
-            ->icon('heroicon-o-check-circle')
+            ->icon('heroicon-m-check-circle')
             ->visible(function (self $record) {
                 return $record->canBeApproved();
             })
+            ->requiresConfirmation()
             ->databaseTransaction()
             ->successNotificationTitle('Recurring invoice approved')
-            ->action(function (self $record, MountableAction $action) {
-                $record->approveDraft();
-
-                $action->success();
+            ->action(function (self $record, MountableAction $action, Component $livewire) {
+                if ($record->hasInactiveAdjustments()) {
+                    $isViewPage = $livewire instanceof ViewRecurringInvoice;
+
+                    if (! $isViewPage) {
+                        redirect(ViewRecurringInvoice::getUrl(['record' => $record->id]));
+                    } else {
+                        Notification::make()
+                            ->warning()
+                            ->title('Cannot approve recurring invoice')
+                            ->body('This recurring invoice has inactive adjustments that must be addressed first.')
+                            ->persistent()
+                            ->send();
+                    }
+                } else {
+                    $record->approveDraft();
+
+                    $action->success();
+                }
             });
     }
 

app/Models/Accounting/Transaction.php

@@ -45,6 +45,7 @@ class Transaction extends Model
         'posted_at',
         'created_by',
         'updated_by',
+        'meta',
     ];
 
     protected $casts = [
@@ -54,6 +55,7 @@ class Transaction extends Model
         'pending' => 'boolean',
         'reviewed' => 'boolean',
         'posted_at' => 'date',
+        'meta' => 'array',
     ];
 
     public function account(): BelongsTo

app/Models/Common/Offering.php

@@ -111,4 +111,11 @@ class Offering extends Model
     {
         return $this->adjustments()->where('category', AdjustmentCategory::Discount)->where('type', AdjustmentType::Purchase);
     }
+
+    public function hasInactiveAdjustments(): bool
+    {
+        return $this->adjustments->contains(function (Adjustment $adjustment) {
+            return $adjustment->isInactive();
+        });
+    }
 }

app/Models/Company.php

@@ -93,6 +93,21 @@ class Company extends FilamentCompaniesCompany implements HasAvatar
         return $this->hasMany(Accounting\Bill::class, 'company_id');
     }
 
+    public function budgets(): HasMany
+    {
+        return $this->hasMany(Accounting\Budget::class, 'company_id');
+    }
+
+    public function budgetItems(): HasMany
+    {
+        return $this->hasMany(Accounting\BudgetItem::class, 'company_id');
+    }
+
+    public function budgetAllocations(): HasMany
+    {
+        return $this->hasMany(Accounting\BudgetAllocation::class, 'company_id');
+    }
+
     public function accountSubtypes(): HasMany
     {
         return $this->hasMany(AccountSubtype::class, 'company_id');

app/Observers/AccountObserver.php

@@ -5,7 +5,6 @@ namespace App\Observers;
 use App\Enums\Accounting\AccountCategory;
 use App\Enums\Accounting\AccountType;
 use App\Models\Accounting\Account;
-use App\Models\Accounting\AccountSubtype;
 use App\Utilities\Accounting\AccountCode;
 use App\Utilities\Currency\CurrencyAccessor;
 
@@ -13,33 +12,33 @@ class AccountObserver
 {
     public function creating(Account $account): void
     {
-        $this->setCategoryAndType($account, true);
-        $this->setCurrency($account);
+        $this->setCategoryAndType($account);
+        $this->ensureDefaultCurrency($account);
     }
 
     public function updating(Account $account): void
     {
         if ($account->isDirty('subtype_id')) {
-            $this->setCategoryAndType($account, false);
+            $this->setCategoryAndType($account);
         }
+
+        $this->ensureDefaultCurrency($account);
     }
 
-    private function setCategoryAndType(Account $account, bool $isCreating): void
+    private function setCategoryAndType(Account $account): void
     {
-        $subtype = $account->subtype_id ? AccountSubtype::find($account->subtype_id) : null;
-
-        if ($subtype) {
+        if ($subtype = $account->subtype) {
             $account->category = $subtype->category;
             $account->type = $subtype->type;
-        } elseif ($isCreating) {
+        } else {
             $account->category = AccountCategory::Asset;
             $account->type = AccountType::CurrentAsset;
         }
     }
 
-    private function setCurrency(Account $account): void
+    private function ensureDefaultCurrency(Account $account): void
     {
-        if ($account->currency_code === null && $account->subtype->multi_currency === false) {
+        if (! $account->currency_code) {
             $account->currency_code = CurrencyAccessor::getDefaultCurrency();
         }
     }
@@ -58,7 +57,7 @@ class AccountObserver
     {
         if (! $account->code) {
             $this->setAccountCode($account);
-            $account->save();
+            $account->saveQuietly();
         }
     }
 }

app/Observers/AdjustmentObserver.php

@@ -2,6 +2,7 @@
 
 namespace App\Observers;
 
+use App\Enums\Accounting\AdjustmentStatus;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\Adjustment;
 
@@ -9,7 +10,7 @@ class AdjustmentObserver
 {
     public function creating(Adjustment $adjustment): void
     {
-        if ($adjustment->account_id === null && ! $adjustment->isNonRecoverablePurchaseTax()) {
+        if (! $adjustment->account_id && ! $adjustment->isNonRecoverablePurchaseTax()) {
             $account = null;
 
             if ($adjustment->isSalesTax()) {
@@ -37,4 +38,47 @@ class AdjustmentObserver
             ]);
         }
     }
+
+    public function saved(Adjustment $adjustment): void
+    {
+        if ($adjustment->wasChanged('status') || $adjustment->wasRecentlyCreated) {
+            if ($adjustment->isInactive()) {
+                $adjustment->account?->update([
+                    'archived' => true,
+                ]);
+            } else {
+                $adjustment->account?->update([
+                    'archived' => false,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * Handle the Adjustment "saving" event.
+     */
+    public function saving(Adjustment $adjustment): void
+    {
+        // Handle dates changes affecting status
+        // Only if the status isn't being explicitly changed and not in a manual state
+        if ($adjustment->isDirty(['start_date', 'end_date']) &&
+            ! $adjustment->isDirty('status') &&
+            ! in_array($adjustment->status, [AdjustmentStatus::Archived, AdjustmentStatus::Paused])) {
+
+            $adjustment->status = $adjustment->calculateNaturalStatus();
+        }
+
+        // Handle auto-resume for paused adjustments with a paused_until date
+        if ($adjustment->shouldAutoResume() && ! $adjustment->isDirty('status')) {
+            $adjustment->status = $adjustment->calculateNaturalStatus();
+            $adjustment->paused_at = null;
+            $adjustment->paused_until = null;
+            $adjustment->status_reason = null;
+        }
+
+        // Ensure consistency between paused status and paused_at field
+        if ($adjustment->status === AdjustmentStatus::Paused && ! $adjustment->paused_at) {
+            $adjustment->paused_at = now();
+        }
+    }
 }

app/Observers/EstimateObserver.php

@@ -11,7 +11,17 @@ class EstimateObserver
 {
     public function saving(Estimate $estimate): void
     {
-        if ($estimate->approved_at && $estimate->is_currently_expired) {
+        if (! $estimate->wasApproved()) {
+            return;
+        }
+
+        if ($estimate->isDirty('expiration_date') && $estimate->status === EstimateStatus::Expired && ! $estimate->is_currently_expired) {
+            $estimate->status = $estimate->hasBeenSent() ? EstimateStatus::Sent : EstimateStatus::Unsent;
+
+            return;
+        }
+
+        if ($estimate->is_currently_expired && $estimate->canBeExpired()) {
             $estimate->status = EstimateStatus::Expired;
         }
     }

app/Observers/TransactionObserver.php

@@ -113,6 +113,16 @@ class TransactionObserver
             ->when($excludedTransaction, fn (Builder $query) => $query->whereKeyNot($excludedTransaction->getKey()))
             ->get()
             ->sum(function (Transaction $transaction) use ($invoiceCurrency) {
+                // If the transaction has stored the original invoice amount in metadata, use that
+                if (! empty($transaction->meta) &&
+                    isset($transaction->meta['original_document_currency']) &&
+                    $transaction->meta['original_document_currency'] === $invoiceCurrency &&
+                    isset($transaction->meta['amount_in_document_currency_cents'])) {
+
+                    return (int) $transaction->meta['amount_in_document_currency_cents'];
+                }
+
+                // Fall back to conversion if metadata is not available
                 $bankAccountCurrency = $transaction->bankAccount->account->currency_code;
                 $amountCents = (int) $transaction->getRawOriginal('amount');
 
@@ -123,6 +133,16 @@ class TransactionObserver
             ->when($excludedTransaction, fn (Builder $query) => $query->whereKeyNot($excludedTransaction->getKey()))
             ->get()
             ->sum(function (Transaction $transaction) use ($invoiceCurrency) {
+                // If the transaction has stored the original invoice amount in metadata, use that
+                if (! empty($transaction->meta) &&
+                    isset($transaction->meta['original_document_currency']) &&
+                    $transaction->meta['original_document_currency'] === $invoiceCurrency &&
+                    isset($transaction->meta['amount_in_document_currency_cents'])) {
+
+                    return (int) $transaction->meta['amount_in_document_currency_cents'];
+                }
+
+                // Fall back to conversion if metadata is not available
                 $bankAccountCurrency = $transaction->bankAccount->account->currency_code;
                 $amountCents = (int) $transaction->getRawOriginal('amount');
 
@@ -136,6 +156,7 @@ class TransactionObserver
         $newStatus = match (true) {
             $totalPaidInInvoiceCurrencyCents > $invoiceTotalInInvoiceCurrencyCents => InvoiceStatus::Overpaid,
             $totalPaidInInvoiceCurrencyCents === $invoiceTotalInInvoiceCurrencyCents => InvoiceStatus::Paid,
+            $totalPaidInInvoiceCurrencyCents === 0 => $invoice->last_sent_at ? InvoiceStatus::Sent : InvoiceStatus::Unsent,
             default => InvoiceStatus::Partial,
         };
 
@@ -166,6 +187,16 @@ class TransactionObserver
             ->when($excludedTransaction, fn (Builder $query) => $query->whereKeyNot($excludedTransaction->getKey()))
             ->get()
             ->sum(function (Transaction $transaction) use ($billCurrency) {
+                // If the transaction has stored the original bill amount in metadata, use that
+                if (! empty($transaction->meta) &&
+                    isset($transaction->meta['original_document_currency']) &&
+                    $transaction->meta['original_document_currency'] === $billCurrency &&
+                    isset($transaction->meta['amount_in_document_currency_cents'])) {
+
+                    return (int) $transaction->meta['amount_in_document_currency_cents'];
+                }
+
+                // Fall back to conversion if metadata is not available
                 $bankAccountCurrency = $transaction->bankAccount->account->currency_code;
                 $amountCents = (int) $transaction->getRawOriginal('amount');
 
@@ -178,6 +209,7 @@ class TransactionObserver
 
         $newStatus = match (true) {
             $totalPaidInBillCurrencyCents >= $billTotalInBillCurrencyCents => BillStatus::Paid,
+            $totalPaidInBillCurrencyCents === 0 => BillStatus::Open,
             default => BillStatus::Partial,
         };
 

app/Policies/AdjustmentPolicy.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Policies;
+
+use App\Enums\Accounting\AdjustmentStatus;
+use App\Models\Accounting\Adjustment;
+use App\Models\User;
+
+class AdjustmentPolicy
+{
+    /**
+     * Determine whether the user can view any models.
+     */
+    public function viewAny(User $user): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can view the model.
+     */
+    public function view(User $user, Adjustment $adjustment): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can create models.
+     */
+    public function create(User $user): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can update the model.
+     */
+    public function update(User $user, Adjustment $adjustment): bool
+    {
+        if ($adjustment->status === AdjustmentStatus::Archived) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Determine whether the user can delete the model.
+     */
+    public function delete(User $user, Adjustment $adjustment): bool
+    {
+        return false;
+    }
+
+    /**
+     * Determine whether the user can restore the model.
+     */
+    public function restore(User $user, Adjustment $adjustment): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can permanently delete the model.
+     */
+    public function forceDelete(User $user, Adjustment $adjustment): bool
+    {
+        return true;
+    }
+}

app/Policies/EstimatePolicy.php

@@ -20,7 +20,7 @@ class EstimatePolicy
      */
     public function view(User $user, Estimate $estimate): bool
     {
-        return $user->belongsToCompany($estimate->company);
+        return true;
     }
 
     /**
@@ -40,7 +40,7 @@ class EstimatePolicy
             return false;
         }
 
-        return $user->belongsToCompany($estimate->company);
+        return true;
     }
 
     /**
@@ -48,7 +48,7 @@ class EstimatePolicy
      */
     public function delete(User $user, Estimate $estimate): bool
     {
-        return $user->belongsToCompany($estimate->company);
+        return true;
     }
 
     /**
@@ -56,7 +56,7 @@ class EstimatePolicy
      */
     public function restore(User $user, Estimate $estimate): bool
     {
-        return $user->belongsToCompany($estimate->company);
+        return true;
     }
 
     /**
@@ -64,6 +64,6 @@ class EstimatePolicy
      */
     public function forceDelete(User $user, Estimate $estimate): bool
     {
-        return $user->belongsToCompany($estimate->company);
+        return true;
     }
 }

app/Providers/Filament/CompanyPanelProvider.php

@@ -25,6 +25,7 @@ use App\Filament\Company\Pages\ManageCompany;
 use App\Filament\Company\Pages\Reports;
 use App\Filament\Company\Pages\Service\ConnectedAccount;
 use App\Filament\Company\Pages\Service\LiveCurrency;
+use App\Filament\Company\Resources\Accounting\BudgetResource;
 use App\Filament\Company\Resources\Banking\AccountResource;
 use App\Filament\Company\Resources\Common\OfferingResource;
 use App\Filament\Company\Resources\Purchases\BillResource;
@@ -39,6 +40,7 @@ use App\Http\Middleware\ConfigureCurrentCompany;
 use App\Livewire\UpdatePassword;
 use App\Livewire\UpdateProfileInformation;
 use App\Models\Company;
+use App\Services\CompanySettingsService;
 use App\Support\FilamentComponentConfigurator;
 use Exception;
 use Filament\Actions;
@@ -133,10 +135,10 @@ class CompanyPanelProvider extends PanelProvider
                             ->label('Sales')
                             ->icon('heroicon-o-currency-dollar')
                             ->items([
+                                ...ClientResource::getNavigationItems(),
+                                ...EstimateResource::getNavigationItems(),
                                 ...InvoiceResource::getNavigationItems(),
                                 ...RecurringInvoiceResource::getNavigationItems(),
-                                ...EstimateResource::getNavigationItems(),
-                                ...ClientResource::getNavigationItems(),
                             ]),
                         NavigationGroup::make('Purchases')
                             ->label('Purchases')
@@ -150,6 +152,7 @@ class CompanyPanelProvider extends PanelProvider
                             ->icon('heroicon-o-clipboard-document-list')
                             ->extraSidebarAttributes(['class' => 'es-sidebar-group'])
                             ->items([
+                                // ...BudgetResource::getNavigationItems(),
                                 ...AccountChart::getNavigationItems(),
                                 ...Transactions::getNavigationItems(),
                             ]),
@@ -272,11 +275,13 @@ class CompanyPanelProvider extends PanelProvider
         });
 
         Tables\Table::configureUsing(static function (Tables\Table $table): void {
+            $table::$defaultDateDisplayFormat = CompanySettingsService::getDefaultDateFormat(session('current_company_id') ?? auth()->user()->current_company_id);
+
             $table
                 ->paginationPageOptions([5, 10, 25, 50, 100])
                 ->filtersFormWidth(MaxWidth::Small)
                 ->filtersTriggerAction(fn (Tables\Actions\Action $action) => $action->slideOver());
-        }, isImportant: true);
+        });
 
         Tables\Columns\TextColumn::configureUsing(function (Tables\Columns\TextColumn $column): void {
             $column->placeholder('–');
@@ -294,7 +299,7 @@ class CompanyPanelProvider extends PanelProvider
             $select
                 ->native(false)
                 ->selectablePlaceholder($isSelectable);
-        }, isImportant: true);
+        });
     }
 
     protected function hasRequiredRule(Select $component): bool

app/Providers/MacroServiceProvider.php

@@ -8,6 +8,7 @@ use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Setting\DateFormat;
 use App\Models\Accounting\AccountSubtype;
 use App\Models\Setting\Localization;
+use App\Services\CompanySettingsService;
 use App\Utilities\Accounting\AccountCode;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
@@ -433,10 +434,9 @@ class MacroServiceProvider extends ServiceProvider
         });
 
         Carbon::macro('toDefaultDateFormat', function () {
-            $localization = Localization::firstOrFail();
-
-            $dateFormat = $localization->date_format->value ?? DateFormat::DEFAULT;
-            $timezone = $localization->timezone ?? Carbon::now()->timezoneName;
+            $companyId = auth()->user()?->current_company_id;
+            $dateFormat = CompanySettingsService::getDefaultDateFormat($companyId);
+            $timezone = CompanySettingsService::getDefaultTimezone($companyId);
 
             return $this->setTimezone($timezone)->format($dateFormat);
         });

app/Services/AccountService.php

@@ -78,7 +78,7 @@ class AccountService
         return new Money($endingBalance, $account->currency_code);
     }
 
-    private function calculateNetMovementByCategory(AccountCategory $category, int $debitBalance, int $creditBalance): int
+    public function calculateNetMovementByCategory(AccountCategory $category, int $debitBalance, int $creditBalance): int
     {
         if ($category->isNormalDebitBalance()) {
             return $debitBalance - $creditBalance;

app/Services/CompanySettingsService.php

@@ -5,35 +5,58 @@ namespace App\Services;
 use App\Enums\Setting\DateFormat;
 use App\Enums\Setting\WeekStart;
 use App\Models\Company;
+use App\Models\Setting\Currency;
 use Illuminate\Support\Facades\Cache;
 
 class CompanySettingsService
 {
-    public static function getSettings(int $companyId): array
+    protected static array $requestCache = [];
+
+    public static function getSettings(?int $companyId = null): array
     {
+        if (! $companyId) {
+            return self::getDefaultSettings();
+        }
+
+        if (isset(self::$requestCache[$companyId])) {
+            return self::$requestCache[$companyId];
+        }
+
         $cacheKey = "company_settings_{$companyId}";
 
-        return Cache::rememberForever($cacheKey, function () use ($companyId) {
+        $settings = Cache::rememberForever($cacheKey, function () use ($companyId) {
             $company = Company::with(['locale'])->find($companyId);
 
             if (! $company) {
                 return self::getDefaultSettings();
             }
 
+            $defaultCurrency = Currency::query()
+                ->where('company_id', $companyId)
+                ->where('enabled', true)
+                ->value('code') ?? 'USD';
+
             return [
                 'default_language' => $company->locale->language ?? config('transmatic.source_locale'),
                 'default_timezone' => $company->locale->timezone ?? config('app.timezone'),
-                'default_currency' => $company->currency_code ?? 'USD',
+                'default_currency' => $defaultCurrency,
                 'default_date_format' => $company->locale->date_format->value ?? DateFormat::DEFAULT,
                 'default_week_start' => $company->locale->week_start->value ?? WeekStart::DEFAULT,
             ];
         });
+
+        self::$requestCache[$companyId] = $settings;
+
+        return $settings;
     }
 
     public static function invalidateSettings(int $companyId): void
     {
         $cacheKey = "company_settings_{$companyId}";
+
         Cache::forget($cacheKey);
+
+        unset(self::$requestCache[$companyId]);
     }
 
     public static function getDefaultSettings(): array
@@ -47,34 +70,34 @@ class CompanySettingsService
         ];
     }
 
-    public static function getSpecificSetting(int $companyId, string $key, $default = null)
+    public static function getSpecificSetting(?int $companyId, string $key, $default = null)
     {
         $settings = self::getSettings($companyId);
 
         return $settings[$key] ?? $default;
     }
 
-    public static function getDefaultLanguage(int $companyId): string
+    public static function getDefaultLanguage(?int $companyId = null): string
     {
         return self::getSpecificSetting($companyId, 'default_language', config('transmatic.source_locale'));
     }
 
-    public static function getDefaultTimezone(int $companyId): string
+    public static function getDefaultTimezone(?int $companyId = null): string
     {
         return self::getSpecificSetting($companyId, 'default_timezone', config('app.timezone'));
     }
 
-    public static function getDefaultCurrency(int $companyId): string
+    public static function getDefaultCurrency(?int $companyId = null): string
     {
         return self::getSpecificSetting($companyId, 'default_currency', 'USD');
     }
 
-    public static function getDefaultDateFormat(int $companyId): string
+    public static function getDefaultDateFormat(?int $companyId = null): string
     {
         return self::getSpecificSetting($companyId, 'default_date_format', DateFormat::DEFAULT);
     }
 
-    public static function getDefaultWeekStart(int $companyId): string
+    public static function getDefaultWeekStart(?int $companyId = null): string
     {
         return self::getSpecificSetting($companyId, 'default_week_start', WeekStart::DEFAULT);
     }

app/Services/TransactionService.php

@@ -46,7 +46,10 @@ class TransactionService
     {
         $transactionType = $startingBalance >= 0 ? TransactionType::Deposit : TransactionType::Withdrawal;
         $accountName = $startingBalance >= 0 ? "Owner's Investment" : "Owner's Drawings";
-        $chartAccount = $account->where('category', AccountCategory::Equity)->where('name', $accountName)->first();
+        $chartAccount = $company->accounts()
+            ->where('category', AccountCategory::Equity)
+            ->where('name', $accountName)
+            ->firstOrFail();
 
         $postedAt = Carbon::parse($startDate)->subDay()->toDateTimeString();
 

app/Utilities/Currency/CurrencyAccessor.php

@@ -5,7 +5,7 @@ namespace App\Utilities\Currency;
 use Akaunting\Money\Currency as ISOCurrencies;
 use App\Facades\Forex;
 use App\Models\Setting\Currency;
-use Illuminate\Support\Facades\Cache;
+use App\Services\CompanySettingsService;
 
 class CurrencyAccessor
 {
@@ -53,17 +53,12 @@ class CurrencyAccessor
 
     public static function getDefaultCurrency(): ?string
     {
-        $companyId = auth()->user()?->currentCompany?->id;
-        $cacheKey = "default_currency_{$companyId}";
+        $companyId = auth()->user()?->current_company_id;
 
         if ($companyId === null) {
             return 'USD';
         }
 
-        return Cache::rememberForever($cacheKey, function () {
-            return Currency::query()
-                ->where('enabled', true)
-                ->value('code');
-        });
+        return CompanySettingsService::getDefaultCurrency($companyId);
     }
 }

app/Utilities/Currency/CurrencyConverter.php

@@ -32,7 +32,7 @@ class CurrencyConverter
 
     public static function prepareForAccessor(string $amount, string $currency): int
     {
-        return money($amount, $currency, true)->getAmount();
+        return self::convertToCents($amount, $currency);
     }
 
     public static function convertCentsToFormatSimple(int $amount, ?string $currency = null): string

app/ValueObjects/Money.php

@@ -11,8 +11,10 @@ class Money
 
     public function __construct(
         private readonly int $amount,
-        private readonly string $currencyCode
-    ) {}
+        private ?string $currencyCode,
+    ) {
+        $this->currencyCode = $currencyCode ?: CurrencyAccessor::getDefaultCurrency();
+    }
 
     public function getAmount(): int
     {

composer.json

@@ -30,6 +30,7 @@
         "symfony/intl": "^6.3"
     },
     "require-dev": {
+        "barryvdh/laravel-debugbar": "^3.15",
         "fakerphp/faker": "^1.23",
         "laravel/pint": "^1.13",
         "laravel/sail": "^1.26",
@@ -62,8 +63,7 @@
             "@php artisan filament:upgrade"
         ],
         "post-update-cmd": [
-            "@php artisan vendor:publish --tag=laravel-assets --ansi --force",
-            "npm up && npm run build || echo \"Skipping npm update and build (npm not available)\""
+            "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
         ],
         "post-root-package-install": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""

config/debugbar.php

@@ -0,0 +1,332 @@
+<?php
+
+return [
+
+    /*
+     |--------------------------------------------------------------------------
+     | Debugbar Settings
+     |--------------------------------------------------------------------------
+     |
+     | Debugbar is enabled by default, when debug is set to true in app.php.
+     | You can override the value by setting enable to true or false instead of null.
+     |
+     | You can provide an array of URI's that must be ignored (eg. 'api/*')
+     |
+     */
+
+    'enabled' => env('DEBUGBAR_ENABLED', false),
+    'hide_empty_tabs' => true, // Hide tabs until they have content
+    'except' => [
+        'telescope*',
+        'horizon*',
+    ],
+
+    /*
+     |--------------------------------------------------------------------------
+     | Storage settings
+     |--------------------------------------------------------------------------
+     |
+     | Debugbar stores data for session/ajax requests.
+     | You can disable this, so the debugbar stores data in headers/session,
+     | but this can cause problems with large data collectors.
+     | By default, file storage (in the storage folder) is used. Redis and PDO
+     | can also be used. For PDO, run the package migrations first.
+     |
+     | Warning: Enabling storage.open will allow everyone to access previous
+     | request, do not enable open storage in publicly available environments!
+     | Specify a callback if you want to limit based on IP or authentication.
+     | Leaving it to null will allow localhost only.
+     */
+    'storage' => [
+        'enabled' => true,
+        'open' => env('DEBUGBAR_OPEN_STORAGE'), // bool/callback.
+        'driver' => 'file', // redis, file, pdo, socket, custom
+        'path' => storage_path('debugbar'), // For file driver
+        'connection' => null,   // Leave null for default connection (Redis/PDO)
+        'provider' => '', // Instance of StorageInterface for custom driver
+        'hostname' => '127.0.0.1', // Hostname to use with the "socket" driver
+        'port' => 2304, // Port to use with the "socket" driver
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Editor
+    |--------------------------------------------------------------------------
+    |
+    | Choose your preferred editor to use when clicking file name.
+    |
+    | Supported: "phpstorm", "vscode", "vscode-insiders", "vscode-remote",
+    |            "vscode-insiders-remote", "vscodium", "textmate", "emacs",
+    |            "sublime", "atom", "nova", "macvim", "idea", "netbeans",
+    |            "xdebug", "espresso"
+    |
+    */
+
+    'editor' => env('DEBUGBAR_EDITOR') ?: env('IGNITION_EDITOR', 'phpstorm'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Remote Path Mapping
+    |--------------------------------------------------------------------------
+    |
+    | If you are using a remote dev server, like Laravel Homestead, Docker, or
+    | even a remote VPS, it will be necessary to specify your path mapping.
+    |
+    | Leaving one, or both of these, empty or null will not trigger the remote
+    | URL changes and Debugbar will treat your editor links as local files.
+    |
+    | "remote_sites_path" is an absolute base path for your sites or projects
+    | in Homestead, Vagrant, Docker, or another remote development server.
+    |
+    | Example value: "/home/vagrant/Code"
+    |
+    | "local_sites_path" is an absolute base path for your sites or projects
+    | on your local computer where your IDE or code editor is running on.
+    |
+    | Example values: "/Users/<name>/Code", "C:\Users\<name>\Documents\Code"
+    |
+    */
+
+    'remote_sites_path' => env('DEBUGBAR_REMOTE_SITES_PATH'),
+    'local_sites_path' => env('DEBUGBAR_LOCAL_SITES_PATH', env('IGNITION_LOCAL_SITES_PATH')),
+
+    /*
+     |--------------------------------------------------------------------------
+     | Vendors
+     |--------------------------------------------------------------------------
+     |
+     | Vendor files are included by default, but can be set to false.
+     | This can also be set to 'js' or 'css', to only include javascript or css vendor files.
+     | Vendor files are for css: font-awesome (including fonts) and highlight.js (css files)
+     | and for js: jquery and highlight.js
+     | So if you want syntax highlighting, set it to true.
+     | jQuery is set to not conflict with existing jQuery scripts.
+     |
+     */
+
+    'include_vendors' => true,
+
+    /*
+     |--------------------------------------------------------------------------
+     | Capture Ajax Requests
+     |--------------------------------------------------------------------------
+     |
+     | The Debugbar can capture Ajax requests and display them. If you don't want this (ie. because of errors),
+     | you can use this option to disable sending the data through the headers.
+     |
+     | Optionally, you can also send ServerTiming headers on ajax requests for the Chrome DevTools.
+     |
+     | Note for your request to be identified as ajax requests they must either send the header
+     | X-Requested-With with the value XMLHttpRequest (most JS libraries send this), or have application/json as a Accept header.
+     |
+     | By default `ajax_handler_auto_show` is set to true allowing ajax requests to be shown automatically in the Debugbar.
+     | Changing `ajax_handler_auto_show` to false will prevent the Debugbar from reloading.
+     |
+     | You can defer loading the dataset, so it will be loaded with ajax after the request is done. (Experimental)
+     */
+
+    'capture_ajax' => true,
+    'add_ajax_timing' => false,
+    'ajax_handler_auto_show' => false,
+    'ajax_handler_enable_tab' => true,
+    'defer_datasets' => false,
+    /*
+     |--------------------------------------------------------------------------
+     | Custom Error Handler for Deprecated warnings
+     |--------------------------------------------------------------------------
+     |
+     | When enabled, the Debugbar shows deprecated warnings for Symfony components
+     | in the Messages tab.
+     |
+     */
+    'error_handler' => false,
+
+    /*
+     |--------------------------------------------------------------------------
+     | Clockwork integration
+     |--------------------------------------------------------------------------
+     |
+     | The Debugbar can emulate the Clockwork headers, so you can use the Chrome
+     | Extension, without the server-side code. It uses Debugbar collectors instead.
+     |
+     */
+    'clockwork' => false,
+
+    /*
+     |--------------------------------------------------------------------------
+     | DataCollectors
+     |--------------------------------------------------------------------------
+     |
+     | Enable/disable DataCollectors
+     |
+     */
+
+    'collectors' => [
+        'phpinfo' => false,  // Php version
+        'messages' => true,  // Messages
+        'time' => true,  // Time Datalogger
+        'memory' => true,  // Memory usage
+        'exceptions' => true,  // Exception displayer
+        'log' => true,  // Logs from Monolog (merged in messages if enabled)
+        'db' => true,  // Show database (PDO) queries and bindings
+        'views' => true,  // Views with their data
+        'route' => false,  // Current route information
+        'auth' => false, // Display Laravel authentication status
+        'gate' => true,  // Display Laravel Gate checks
+        'session' => false,  // Display session data
+        'symfony_request' => true,  // Only one can be enabled..
+        'mail' => true,  // Catch mail messages
+        'laravel' => true, // Laravel version and environment
+        'events' => false, // All events fired
+        'default_request' => false, // Regular or special Symfony request logger
+        'logs' => false, // Add the latest log messages
+        'files' => false, // Show the included files
+        'config' => false, // Display config settings
+        'cache' => false, // Display cache events
+        'models' => true,  // Display models
+        'livewire' => true,  // Display Livewire (when available)
+        'jobs' => false, // Display dispatched jobs
+        'pennant' => false, // Display Pennant feature flags
+    ],
+
+    /*
+     |--------------------------------------------------------------------------
+     | Extra options
+     |--------------------------------------------------------------------------
+     |
+     | Configure some DataCollectors
+     |
+     */
+
+    'options' => [
+        'time' => [
+            'memory_usage' => false,  // Calculated by subtracting memory start and end, it may be inaccurate
+        ],
+        'messages' => [
+            'trace' => true,   // Trace the origin of the debug message
+        ],
+        'memory' => [
+            'reset_peak' => false,     // run memory_reset_peak_usage before collecting
+            'with_baseline' => false,  // Set boot memory usage as memory peak baseline
+            'precision' => 0,          // Memory rounding precision
+        ],
+        'auth' => [
+            'show_name' => true,   // Also show the users name/email in the debugbar
+            'show_guards' => true, // Show the guards that are used
+        ],
+        'db' => [
+            'with_params' => true,   // Render SQL with the parameters substituted
+            'exclude_paths' => [       // Paths to exclude entirely from the collector
+                //                'vendor/laravel/framework/src/Illuminate/Session', // Exclude sessions queries
+            ],
+            'backtrace' => true,   // Use a backtrace to find the origin of the query in your files.
+            'backtrace_exclude_paths' => [],   // Paths to exclude from backtrace. (in addition to defaults)
+            'timeline' => false,  // Add the queries to the timeline
+            'duration_background' => true,   // Show shaded background on each query relative to how long it took to execute.
+            'explain' => [                 // Show EXPLAIN output on queries
+                'enabled' => false,
+            ],
+            'hints' => false,   // Show hints for common mistakes
+            'show_copy' => true,    // Show copy button next to the query,
+            'slow_threshold' => false,   // Only track queries that last longer than this time in ms
+            'memory_usage' => false,   // Show queries memory usage
+            'soft_limit' => 100,      // After the soft limit, no parameters/backtrace are captured
+            'hard_limit' => 500,      // After the hard limit, queries are ignored
+        ],
+        'mail' => [
+            'timeline' => true,  // Add mails to the timeline
+            'show_body' => true,
+        ],
+        'views' => [
+            'timeline' => true,    // Add the views to the timeline
+            'data' => false,        // True for all data, 'keys' for only names, false for no parameters.
+            'group' => 50,          // Group duplicate views. Pass value to auto-group, or true/false to force
+            'exclude_paths' => [    // Add the paths which you don't want to appear in the views
+                'vendor/filament',   // Exclude Filament components by default
+            ],
+        ],
+        'route' => [
+            'label' => true,  // Show complete route on bar
+        ],
+        'session' => [
+            'hiddens' => [], // Hides sensitive values using array paths
+        ],
+        'symfony_request' => [
+            'label' => true,  // Show route on bar
+            'hiddens' => [], // Hides sensitive values using array paths, example: request_request.password
+        ],
+        'events' => [
+            'data' => false, // Collect events data, listeners
+        ],
+        'logs' => [
+            'file' => null,
+        ],
+        'cache' => [
+            'values' => true, // Collect cache values
+        ],
+    ],
+
+    /*
+     |--------------------------------------------------------------------------
+     | Inject Debugbar in Response
+     |--------------------------------------------------------------------------
+     |
+     | Usually, the debugbar is added just before </body>, by listening to the
+     | Response after the App is done. If you disable this, you have to add them
+     | in your template yourself. See http://phpdebugbar.com/docs/rendering.html
+     |
+     */
+
+    'inject' => true,
+
+    /*
+     |--------------------------------------------------------------------------
+     | Debugbar route prefix
+     |--------------------------------------------------------------------------
+     |
+     | Sometimes you want to set route prefix to be used by Debugbar to load
+     | its resources from. Usually the need comes from misconfigured web server or
+     | from trying to overcome bugs like this: http://trac.nginx.org/nginx/ticket/97
+     |
+     */
+    'route_prefix' => '_debugbar',
+
+    /*
+     |--------------------------------------------------------------------------
+     | Debugbar route middleware
+     |--------------------------------------------------------------------------
+     |
+     | Additional middleware to run on the Debugbar routes
+     */
+    'route_middleware' => [],
+
+    /*
+     |--------------------------------------------------------------------------
+     | Debugbar route domain
+     |--------------------------------------------------------------------------
+     |
+     | By default Debugbar route served from the same domain that request served.
+     | To override default domain, specify it as a non-empty value.
+     */
+    'route_domain' => null,
+
+    /*
+     |--------------------------------------------------------------------------
+     | Debugbar theme
+     |--------------------------------------------------------------------------
+     |
+     | Switches between light and dark theme. If set to auto it will respect system preferences
+     | Possible values: auto, light, dark
+     */
+    'theme' => env('DEBUGBAR_THEME', 'auto'),
+
+    /*
+     |--------------------------------------------------------------------------
+     | Backtrace stack limit
+     |--------------------------------------------------------------------------
+     |
+     | By default, the Debugbar limits the number of frames returned by the 'debug_backtrace()' function.
+     | If you need larger stacktraces, you can increase this number. Setting it to 0 will result in no limit.
+     */
+    'debug_backtrace_limit' => 50,
+];

database/factories/Accounting/BudgetAllocationFactory.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Factories\Accounting;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Accounting\BudgetAllocation>
+ */
+class BudgetAllocationFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            //
+        ];
+    }
+}

database/factories/Accounting/BudgetFactory.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Factories\Accounting;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Accounting\Budget>
+ */
+class BudgetFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            //
+        ];
+    }
+}

database/factories/Accounting/BudgetItemFactory.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Factories\Accounting;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Accounting\BudgetItem>
+ */
+class BudgetItemFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            //
+        ];
+    }
+}

database/migrations/2024_01_01_234943_create_transactions_table.php

@@ -27,6 +27,7 @@ return new class extends Migration
             $table->text('notes')->nullable();
             $table->string('reference')->nullable();
             $table->bigInteger('amount')->default(0);
+            $table->json('meta')->nullable();
             $table->boolean('pending')->default(false);
             $table->boolean('reviewed')->default(false);
             $table->dateTime('posted_at');

database/migrations/2024_11_14_230753_create_adjustments_table.php

@@ -16,6 +16,8 @@ return new class extends Migration
             $table->foreignId('company_id')->constrained()->cascadeOnDelete();
             $table->foreignId('account_id')->nullable()->constrained('accounts')->nullOnDelete();
             $table->string('name')->nullable();
+            $table->string('status')->default('active');
+            $table->text('status_reason')->nullable();
             $table->text('description')->nullable();
             $table->string('category')->default('tax');
             $table->string('type')->default('sales');
@@ -25,6 +27,9 @@ return new class extends Migration
             $table->string('scope')->nullable();
             $table->dateTime('start_date')->nullable();
             $table->dateTime('end_date')->nullable();
+            $table->timestamp('paused_at')->nullable();
+            $table->timestamp('paused_until')->nullable();
+            $table->timestamp('archived_at')->nullable();
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();

database/migrations/2025_03_15_191245_create_budgets_table.php

@@ -0,0 +1,43 @@
+<?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::create('budgets', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('company_id')->constrained()->cascadeOnDelete();
+            $table->foreignId('source_budget_id')->nullable()->constrained('budgets')->nullOnDelete();
+            // Source fiscal year
+            $table->year('source_fiscal_year')->nullable();
+            $table->string('source_type')->nullable(); // budget, actuals
+            $table->string('name');
+            $table->date('start_date');
+            $table->date('end_date');
+            $table->string('status')->default('draft'); // draft, active, closed
+            $table->string('interval_type')->default('month'); // day, week, month, quarter, year
+            $table->text('notes')->nullable();
+            $table->timestamp('approved_at')->nullable();
+            $table->foreignId('approved_by_id')->nullable()->constrained('users')->nullOnDelete();
+            $table->timestamp('closed_at')->nullable();
+            $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
+            $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('budgets');
+    }
+};

database/migrations/2025_03_15_191321_create_budget_items_table.php

@@ -0,0 +1,32 @@
+<?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::create('budget_items', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('company_id')->constrained()->cascadeOnDelete();
+            $table->foreignId('budget_id')->constrained()->cascadeOnDelete();
+            $table->foreignId('account_id')->constrained('accounts')->cascadeOnDelete();
+            $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
+            $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('budget_items');
+    }
+};

database/migrations/2025_03_15_203454_create_budget_allocations_table.php

@@ -0,0 +1,34 @@
+<?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::create('budget_allocations', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('company_id')->constrained()->cascadeOnDelete();
+            $table->foreignId('budget_item_id')->constrained()->cascadeOnDelete();
+            $table->string('period'); // e.g., 'Jan 2024', 'Q1 2024', '2024'
+            $table->string('interval_type'); // 'month', 'quarter', 'year'
+            $table->date('start_date'); // Period start
+            $table->date('end_date'); // Period end
+            $table->bigInteger('amount')->default(0); // Stored in cents
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('budget_allocations');
+    }
+};

package-lock.json

@@ -575,9 +575,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.35.0.tgz",
-            "integrity": "sha512-uYQ2WfPaqz5QtVgMxfN6NpLD+no0MYHDBywl7itPYd3K5TjjSghNKmX8ic9S8NU8w81NVhJv/XojcHptRly7qQ==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.36.0.tgz",
+            "integrity": "sha512-jgrXjjcEwN6XpZXL0HUeOVGfjXhPyxAbbhD0BlXUB+abTOpbPiN5Wb3kOT7yb+uEtATNYF5x5gIfwutmuBA26w==",
             "cpu": [
                 "arm"
             ],
@@ -589,9 +589,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.35.0.tgz",
-            "integrity": "sha512-FtKddj9XZudurLhdJnBl9fl6BwCJ3ky8riCXjEw3/UIbjmIY58ppWwPEvU3fNu+W7FUsAsB1CdH+7EQE6CXAPA==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.36.0.tgz",
+            "integrity": "sha512-NyfuLvdPdNUfUNeYKUwPwKsE5SXa2J6bCt2LdB/N+AxShnkpiczi3tcLJrm5mA+eqpy0HmaIY9F6XCa32N5yzg==",
             "cpu": [
                 "arm64"
             ],
@@ -603,9 +603,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.35.0.tgz",
-            "integrity": "sha512-Uk+GjOJR6CY844/q6r5DR/6lkPFOw0hjfOIzVx22THJXMxktXG6CbejseJFznU8vHcEBLpiXKY3/6xc+cBm65Q==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.36.0.tgz",
+            "integrity": "sha512-JQ1Jk5G4bGrD4pWJQzWsD8I1n1mgPXq33+/vP4sk8j/z/C2siRuxZtaUA7yMTf71TCZTZl/4e1bfzwUmFb3+rw==",
             "cpu": [
                 "arm64"
             ],
@@ -617,9 +617,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.35.0.tgz",
-            "integrity": "sha512-3IrHjfAS6Vkp+5bISNQnPogRAW5GAV1n+bNCrDwXmfMHbPl5EhTmWtfmwlJxFRUCBZ+tZ/OxDyU08aF6NI/N5Q==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.36.0.tgz",
+            "integrity": "sha512-6c6wMZa1lrtiRsbDziCmjE53YbTkxMYhhnWnSW8R/yqsM7a6mSJ3uAVT0t8Y/DGt7gxUWYuFM4bwWk9XCJrFKA==",
             "cpu": [
                 "x64"
             ],
@@ -631,9 +631,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.35.0.tgz",
-            "integrity": "sha512-sxjoD/6F9cDLSELuLNnY0fOrM9WA0KrM0vWm57XhrIMf5FGiN8D0l7fn+bpUeBSU7dCgPV2oX4zHAsAXyHFGcQ==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.36.0.tgz",
+            "integrity": "sha512-KXVsijKeJXOl8QzXTsA+sHVDsFOmMCdBRgFmBb+mfEb/7geR7+C8ypAml4fquUt14ZyVXaw2o1FWhqAfOvA4sg==",
             "cpu": [
                 "arm64"
             ],
@@ -645,9 +645,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.35.0.tgz",
-            "integrity": "sha512-2mpHCeRuD1u/2kruUiHSsnjWtHjqVbzhBkNVQ1aVD63CcexKVcQGwJ2g5VphOd84GvxfSvnnlEyBtQCE5hxVVw==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.36.0.tgz",
+            "integrity": "sha512-dVeWq1ebbvByI+ndz4IJcD4a09RJgRYmLccwlQ8bPd4olz3Y213uf1iwvc7ZaxNn2ab7bjc08PrtBgMu6nb4pQ==",
             "cpu": [
                 "x64"
             ],
@@ -659,9 +659,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.35.0.tgz",
-            "integrity": "sha512-mrA0v3QMy6ZSvEuLs0dMxcO2LnaCONs1Z73GUDBHWbY8tFFocM6yl7YyMu7rz4zS81NDSqhrUuolyZXGi8TEqg==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.36.0.tgz",
+            "integrity": "sha512-bvXVU42mOVcF4le6XSjscdXjqx8okv4n5vmwgzcmtvFdifQ5U4dXFYaCB87namDRKlUL9ybVtLQ9ztnawaSzvg==",
             "cpu": [
                 "arm"
             ],
@@ -673,9 +673,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.35.0.tgz",
-            "integrity": "sha512-DnYhhzcvTAKNexIql8pFajr0PiDGrIsBYPRvCKlA5ixSS3uwo/CWNZxB09jhIapEIg945KOzcYEAGGSmTSpk7A==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.36.0.tgz",
+            "integrity": "sha512-JFIQrDJYrxOnyDQGYkqnNBtjDwTgbasdbUiQvcU8JmGDfValfH1lNpng+4FWlhaVIR4KPkeddYjsVVbmJYvDcg==",
             "cpu": [
                 "arm"
             ],
@@ -687,9 +687,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.35.0.tgz",
-            "integrity": "sha512-uagpnH2M2g2b5iLsCTZ35CL1FgyuzzJQ8L9VtlJ+FckBXroTwNOaD0z0/UF+k5K3aNQjbm8LIVpxykUOQt1m/A==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.36.0.tgz",
+            "integrity": "sha512-KqjYVh3oM1bj//5X7k79PSCZ6CvaVzb7Qs7VMWS+SlWB5M8p3FqufLP9VNp4CazJ0CsPDLwVD9r3vX7Ci4J56A==",
             "cpu": [
                 "arm64"
             ],
@@ -701,9 +701,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.35.0.tgz",
-            "integrity": "sha512-XQxVOCd6VJeHQA/7YcqyV0/88N6ysSVzRjJ9I9UA/xXpEsjvAgDTgH3wQYz5bmr7SPtVK2TsP2fQ2N9L4ukoUg==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.36.0.tgz",
+            "integrity": "sha512-QiGnhScND+mAAtfHqeT+cB1S9yFnNQ/EwCg5yE3MzoaZZnIV0RV9O5alJAoJKX/sBONVKeZdMfO8QSaWEygMhw==",
             "cpu": [
                 "arm64"
             ],
@@ -715,9 +715,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.35.0.tgz",
-            "integrity": "sha512-5pMT5PzfgwcXEwOaSrqVsz/LvjDZt+vQ8RT/70yhPU06PTuq8WaHhfT1LW+cdD7mW6i/J5/XIkX/1tCAkh1W6g==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.36.0.tgz",
+            "integrity": "sha512-1ZPyEDWF8phd4FQtTzMh8FQwqzvIjLsl6/84gzUxnMNFBtExBtpL51H67mV9xipuxl1AEAerRBgBwFNpkw8+Lg==",
             "cpu": [
                 "loong64"
             ],
@@ -729,9 +729,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.35.0.tgz",
-            "integrity": "sha512-c+zkcvbhbXF98f4CtEIP1EBA/lCic5xB0lToneZYvMeKu5Kamq3O8gqrxiYYLzlZH6E3Aq+TSW86E4ay8iD8EA==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.36.0.tgz",
+            "integrity": "sha512-VMPMEIUpPFKpPI9GZMhJrtu8rxnp6mJR3ZzQPykq4xc2GmdHj3Q4cA+7avMyegXy4n1v+Qynr9fR88BmyO74tg==",
             "cpu": [
                 "ppc64"
             ],
@@ -743,9 +743,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.35.0.tgz",
-            "integrity": "sha512-s91fuAHdOwH/Tad2tzTtPX7UZyytHIRR6V4+2IGlV0Cej5rkG0R61SX4l4y9sh0JBibMiploZx3oHKPnQBKe4g==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.36.0.tgz",
+            "integrity": "sha512-ttE6ayb/kHwNRJGYLpuAvB7SMtOeQnVXEIpMtAvx3kepFQeowVED0n1K9nAdraHUPJ5hydEMxBpIR7o4nrm8uA==",
             "cpu": [
                 "riscv64"
             ],
@@ -757,9 +757,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.35.0.tgz",
-            "integrity": "sha512-hQRkPQPLYJZYGP+Hj4fR9dDBMIM7zrzJDWFEMPdTnTy95Ljnv0/4w/ixFw3pTBMEuuEuoqtBINYND4M7ujcuQw==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.36.0.tgz",
+            "integrity": "sha512-4a5gf2jpS0AIe7uBjxDeUMNcFmaRTbNv7NxI5xOCs4lhzsVyGR/0qBXduPnoWf6dGC365saTiwag8hP1imTgag==",
             "cpu": [
                 "s390x"
             ],
@@ -771,9 +771,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.35.0.tgz",
-            "integrity": "sha512-Pim1T8rXOri+0HmV4CdKSGrqcBWX0d1HoPnQ0uw0bdp1aP5SdQVNBy8LjYncvnLgu3fnnCt17xjWGd4cqh8/hA==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.36.0.tgz",
+            "integrity": "sha512-5KtoW8UWmwFKQ96aQL3LlRXX16IMwyzMq/jSSVIIyAANiE1doaQsx/KRyhAvpHlPjPiSU/AYX/8m+lQ9VToxFQ==",
             "cpu": [
                 "x64"
             ],
@@ -785,9 +785,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.35.0.tgz",
-            "integrity": "sha512-QysqXzYiDvQWfUiTm8XmJNO2zm9yC9P/2Gkrwg2dH9cxotQzunBHYr6jk4SujCTqnfGxduOmQcI7c2ryuW8XVg==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.36.0.tgz",
+            "integrity": "sha512-sycrYZPrv2ag4OCvaN5js+f01eoZ2U+RmT5as8vhxiFz+kxwlHrsxOwKPSA8WyS+Wc6Epid9QeI/IkQ9NkgYyQ==",
             "cpu": [
                 "x64"
             ],
@@ -799,9 +799,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.35.0.tgz",
-            "integrity": "sha512-OUOlGqPkVJCdJETKOCEf1mw848ZyJ5w50/rZ/3IBQVdLfR5jk/6Sr5m3iO2tdPgwo0x7VcncYuOvMhBWZq8ayg==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.36.0.tgz",
+            "integrity": "sha512-qbqt4N7tokFwwSVlWDsjfoHgviS3n/vZ8LK0h1uLG9TYIRuUTJC88E1xb3LM2iqZ/WTqNQjYrtmtGmrmmawB6A==",
             "cpu": [
                 "arm64"
             ],
@@ -813,9 +813,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.35.0.tgz",
-            "integrity": "sha512-2/lsgejMrtwQe44glq7AFFHLfJBPafpsTa6JvP2NGef/ifOa4KBoglVf7AKN7EV9o32evBPRqfg96fEHzWo5kw==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.36.0.tgz",
+            "integrity": "sha512-t+RY0JuRamIocMuQcfwYSOkmdX9dtkr1PbhKW42AMvaDQa+jOdpUYysroTF/nuPpAaQMWp7ye+ndlmmthieJrQ==",
             "cpu": [
                 "ia32"
             ],
@@ -827,9 +827,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.35.0.tgz",
-            "integrity": "sha512-PIQeY5XDkrOysbQblSW7v3l1MDZzkTEzAfTPkj5VAu3FW8fS4ynyLg2sINp0fp3SjZ8xkRYpLqoKcYqAkhU1dw==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.36.0.tgz",
+            "integrity": "sha512-aRXd7tRZkWLqGbChgcMMDEHjOKudo1kChb1Jt1IfR8cY/KIpgNviLeJy5FUb9IpSuQj8dU2fAYNMPW/hLKOSTw==",
             "cpu": [
                 "x64"
             ],
@@ -1088,9 +1088,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001704",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001704.tgz",
-            "integrity": "sha512-+L2IgBbV6gXB4ETf0keSvLr7JUrRVbIaB/lrQ1+z8mRcQiisG5k+lG6O4n6Y5q6f5EuNfaYXKgymucphlEXQew==",
+            "version": "1.0.30001706",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001706.tgz",
+            "integrity": "sha512-3ZczoTApMAZwPKYWmwVbQMFpXBDds3/0VciVoUwPUbldlYyVLmRVuRs/PcUZtHpbLRpzzDvrvnFuREsGt6lUug==",
             "dev": true,
             "funding": [
                 {
@@ -1264,9 +1264,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.119",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.119.tgz",
-            "integrity": "sha512-Ku4NMzUjz3e3Vweh7PhApPrZSS4fyiCIbcIrG9eKrriYVLmbMepETR/v6SU7xPm98QTqMSYiCwfO89QNjXLkbQ==",
+            "version": "1.5.120",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.120.tgz",
+            "integrity": "sha512-oTUp3gfX1gZI+xfD2djr2rzQdHCwHzPQrrK0CD7WpTdF0nPdQ/INcRVjWgLdCT4a9W3jFObR9DAfsuyFQnI8CQ==",
             "dev": true,
             "license": "ISC"
         },
@@ -1930,9 +1930,9 @@
             }
         },
         "node_modules/nanoid": {
-            "version": "3.3.9",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.9.tgz",
-            "integrity": "sha512-SppoicMGpZvbF1l3z4x7No3OlIjP7QJvC9XR7AhZr1kL133KHnKPztkKDc+Ir4aJ/1VhTySrtKhrsycmrMQfvg==",
+            "version": "3.3.11",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+            "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
             "dev": true,
             "funding": [
                 {
@@ -2412,9 +2412,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.35.0.tgz",
-            "integrity": "sha512-kg6oI4g+vc41vePJyO6dHt/yl0Rz3Thv0kJeVQ3D1kS3E5XSuKbPc29G4IpT/Kv1KQwgHVcN+HtyS+HYLNSvQg==",
+            "version": "4.36.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.36.0.tgz",
+            "integrity": "sha512-zwATAXNQxUcd40zgtQG0ZafcRK4g004WtEl7kbuhTWPvf07PsfohXl39jVUvPF7jvNAIkKPQ2XrsDlWuxBd++Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2428,25 +2428,25 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.35.0",
-                "@rollup/rollup-android-arm64": "4.35.0",
-                "@rollup/rollup-darwin-arm64": "4.35.0",
-                "@rollup/rollup-darwin-x64": "4.35.0",
-                "@rollup/rollup-freebsd-arm64": "4.35.0",
-                "@rollup/rollup-freebsd-x64": "4.35.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.35.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.35.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.35.0",
-                "@rollup/rollup-linux-arm64-musl": "4.35.0",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.35.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.35.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.35.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.35.0",
-                "@rollup/rollup-linux-x64-gnu": "4.35.0",
-                "@rollup/rollup-linux-x64-musl": "4.35.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.35.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.35.0",
-                "@rollup/rollup-win32-x64-msvc": "4.35.0",
+                "@rollup/rollup-android-arm-eabi": "4.36.0",
+                "@rollup/rollup-android-arm64": "4.36.0",
+                "@rollup/rollup-darwin-arm64": "4.36.0",
+                "@rollup/rollup-darwin-x64": "4.36.0",
+                "@rollup/rollup-freebsd-arm64": "4.36.0",
+                "@rollup/rollup-freebsd-x64": "4.36.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.36.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.36.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.36.0",
+                "@rollup/rollup-linux-arm64-musl": "4.36.0",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.36.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.36.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.36.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.36.0",
+                "@rollup/rollup-linux-x64-gnu": "4.36.0",
+                "@rollup/rollup-linux-x64-musl": "4.36.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.36.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.36.0",
+                "@rollup/rollup-win32-x64-msvc": "4.36.0",
                 "fsevents": "~2.3.2"
             }
         },

resources/css/filament/company/custom-section.css

@@ -48,10 +48,6 @@
     &.fi-section-not-contained:not(.fi-aside) {
         @apply grid gap-y-4;
 
-        & .fi-section-header {
-            @apply py-2;
-        }
-
         & .fi-section-content-ctn {
             @apply grid gap-y-4;
         }

resources/css/filament/company/form-fields.css

@@ -29,10 +29,6 @@
 }
 
 /* Choices.js select field overrides */
-.choices__list.choices__list--single {
-    @apply w-full;
-}
-
 .choices:focus-visible {
     outline: none;
 }
@@ -41,52 +37,166 @@
     @apply text-gray-900 dark:text-white font-semibold;
 }
 
-.choices[data-type="select-one"] .choices__inner {
-    line-height: 1.5;
-    display: flex;
-    align-items: center;
-    min-height: 2.25rem;
-    box-sizing: border-box;
-}
-
 .choices:not(.is-disabled) .choices__item {
     cursor: pointer;
 }
 
 /* Table Repeater Styles */
-.table-repeater-container {
-    @apply rounded-none ring-0;
-}
+:not(.is-spreadsheet) {
+    .table-repeater-container {
+        @apply rounded-none ring-0;
+    }
+
+    .table-repeater-component {
+        @apply space-y-10;
+    }
 
-.table-repeater-component {
-    @apply space-y-10;
+    .table-repeater-component ul {
+        @apply justify-start;
+    }
+
+    .table-repeater-row {
+        @apply divide-x-0 !important;
+    }
+
+    .table-repeater-column {
+        @apply py-2 !important;
+    }
+
+    .table-repeater-header {
+        @apply rounded-t-none !important;
+    }
+
+    .table-repeater-rows-wrapper {
+        @apply divide-gray-300 last:border-b last:border-gray-300 dark:divide-white/20 dark:last:border-white/20;
+    }
+
+    .table-repeater-header tr {
+        @apply divide-x-0 text-base sm:text-sm sm:leading-6 !important;
+    }
+
+    .table-repeater-header-column {
+        @apply ps-3 pe-3 font-semibold bg-gray-200 dark:bg-gray-800 rounded-none !important;
+    }
 }
 
-.table-repeater-component ul {
-    @apply justify-start;
+/* Excel/Spreadsheet styling */
+.is-spreadsheet {
+    .table-repeater-container {
+        overflow-x: auto;
+        max-width: 100%;
+        -webkit-overflow-scrolling: touch;
+    }
+
+    .table-repeater-container:has(.choices.is-open) {
+        overflow: visible;
+    }
+
+    .table-repeater-container table {
+        min-width: 100%;
+        width: max-content;
+    }
+
+    .table-repeater-container {
+        border: 1px solid #e5e7eb !important;
+        border-radius: 0 !important;
+        @apply ring-0 !important;
+    }
+
+    .table-repeater-header {
+        background-color: #f8f9fa !important;
+    }
+
+    .table-repeater-header-column {
+        border: 1px solid #e5e7eb !important;
+        background-color: #f8f9fa !important;
+        font-weight: 600 !important;
+        padding: 8px 12px !important;
+    }
+
+    .table-repeater-column {
+        border: 1px solid #e5e7eb !important;
+        padding: 8px 12px !important;
+    }
+
+    .table-repeater-column input {
+        text-align: right !important;
+    }
+
+    .fi-input-wrapper,
+    .fi-input {
+        padding: 0 !important;
+    }
+
+    .fi-input-wrp,
+    .fi-fo-file-upload .filepond--root {
+        @apply ring-0 bg-transparent shadow-none rounded-none !important;
+    }
+
+    .fi-input-wrp input {
+        @apply bg-transparent !important;
+    }
+
+    .table-repeater-column:focus-within {
+        outline: 2px solid #2563eb !important;
+        outline-offset: -2px !important;
+        z-index: 1 !important;
+    }
+
+    input:focus,
+    select:focus,
+    textarea:focus {
+        @apply ring-0 shadow-none !important;
+        outline: none !important;
+    }
+
+    .table-repeater-row:nth-child(even) {
+        background-color: #f9fafb;
+    }
+
+    .fi-fo-field-wrp:has(.fi-fo-checkbox-list),
+    .fi-fo-field-wrp:has(.fi-checkbox-input),
+    .fi-fo-field-wrp:has(.fi-fo-radio) {
+        @apply py-2 px-3 !important;
+    }
+
+    .fi-fo-field-wrp:has(.fi-fo-toggle) {
+        @apply inline-block mt-1 !important;
+    }
 }
 
-.table-repeater-row {
-    @apply divide-x-0 !important;
+/* Responsive behavior */
+@media (max-width: theme('screens.sm')) {
+    .table-repeater-component.break-point-sm .table-repeater-container {
+        overflow-x: visible;
+    }
 }
 
-.table-repeater-column {
-    @apply py-2 !important;
+@media (max-width: theme('screens.md')) {
+    .table-repeater-component.break-point-md .table-repeater-container {
+        overflow-x: visible;
+    }
 }
 
-.table-repeater-header {
-    @apply rounded-t-none !important;
+@media (max-width: theme('screens.lg')) {
+    .table-repeater-component.break-point-lg .table-repeater-container {
+        overflow-x: visible;
+    }
 }
 
-.table-repeater-rows-wrapper {
-    @apply divide-gray-300 last:border-b last:border-gray-300 dark:divide-white/20 dark:last:border-white/20;
+@media (max-width: theme('screens.xl')) {
+    .table-repeater-component.break-point-xl .table-repeater-container {
+        overflow-x: visible;
+    }
 }
 
-.table-repeater-header tr {
-    @apply divide-x-0 text-base sm:text-sm sm:leading-6 !important;
+@media (max-width: theme('screens.2xl')) {
+    .table-repeater-component.break-point-2xl .table-repeater-container {
+        overflow-x: visible;
+    }
 }
 
-.table-repeater-header-column {
-    @apply ps-3 pe-3 font-semibold bg-gray-200 dark:bg-gray-800 rounded-none !important;
+.is-spreadsheet .table-repeater-column .fi-input-wrp-suffix {
+    padding-right: 0 !important;
 }
 

resources/css/filament/company/modal.css

@@ -1,18 +1,20 @@
 /* Journal Entry Modal Styles */
 .fi-modal.fi-width-screen {
-    .fi-modal-header {
-        @apply xl:px-80;
+    .fi-modal-window.journal-transaction-modal {
+        .fi-modal-header {
+            @apply xl:px-80;
 
-        .absolute.end-4.top-4 {
-            @apply xl:end-80;
+            .absolute.end-4.top-4 {
+                @apply xl:end-80;
+            }
         }
-    }
 
-    .fi-modal-content {
-        @apply xl:px-80;
-    }
+        .fi-modal-content {
+            @apply xl:px-80;
+        }
 
-    .fi-modal-footer {
-        @apply xl:px-80;
+        .fi-modal-footer {
+            @apply xl:px-80;
+        }
     }
 }

resources/css/filament/company/theme.css

@@ -28,11 +28,7 @@
 
 /* End Alignment sortable column enhancement */
 .fi-ta-header-cell:has(button.justify-end > svg.fi-ta-header-cell-sort-icon) {
-    padding-right: 0.25rem;
-}
-
-.fi-ta-cell:has(.fi-ta-col-wrp > .justify-end) {
-    padding-right: 1rem;
+    padding-right: 0;
 }
 
 :not(.dark) .fi-body {
@@ -57,3 +53,51 @@
     pointer-events: none;
     z-index: -1;
 }
+
+.fi-ta-table:has(.budget-items-relation-manager) {
+    .fi-ta-row {
+        @apply divide-x divide-gray-200 dark:divide-gray-700;
+    }
+
+    .fi-ta-summary-row-heading {
+        @apply px-3 py-3 !important;
+    }
+
+    .fi-ta-text-summary {
+        @apply px-3 py-3 !important;
+
+        > span {
+            @apply font-medium text-gray-950 dark:text-white;
+        }
+    }
+
+    .fi-ta-text {
+        @apply px-3 py-0 !important;
+    }
+
+    .fi-ta-text-input {
+        @apply px-0 py-0 !important;
+    }
+
+    .fi-ta-icon {
+        @apply px-3 py-0 !important;
+    }
+
+    .fi-ta-text-input {
+        .fi-input-wrp,
+        .fi-input {
+            @apply ring-0 bg-transparent shadow-none rounded-none !important;
+        }
+    }
+
+    .fi-ta-cell:focus-within {
+        outline: 2px solid #2563eb;
+        outline-offset: -2px;
+        z-index: 1;
+    }
+
+    .fi-ta-col-wrp button:focus {
+        outline: none !important;
+        box-shadow: none !important;
+    }
+}