update composer.json and composer.lock files..

Improve category tabs

.github/workflows/tests.yml

@@ -20,10 +20,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Cache Composer
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.composer/cache/files
           key: php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

.github/workflows/translations.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Sync with Crowdin
       uses: crowdin/github-action@master

.htaccess

@@ -24,6 +24,10 @@
         </IfModule>
     </FilesMatch>
 
+    # Prevent Direct Access to Protected Files (OpenLiteSpeed syntax)
+    RewriteCond %{REQUEST_URI} (^|/)(\.env|\.log|artisan)$ [NC]
+    RewriteRule .* - [F,L]
+
     # Prevent Direct Access To Protected Folders
     RewriteRule ^(app|bootstrap|config|database|overrides|resources|routes|storage|tests)/(.*) / [L,R=301]
 

README.md

@@ -17,7 +17,7 @@ Online accounting software designed for small businesses and freelancers. Akaunt
 ## Requirements
 
 * PHP 8.1 or higher
-* Database (e.g.: MySQL, PostgreSQL, SQLite)
+* Database (e.g.: MariaDB, MySQL, PostgreSQL, SQLite)
 * Web Server (eg: Apache, Nginx, IIS)
 * [Other libraries](https://akaunting.com/hc/docs/on-premise/requirements/)
 

app/Abstracts/BulkAction.php

@@ -304,7 +304,7 @@ abstract class BulkAction
 
                 $batch[] = new CreateMediableForDownload(user(), $file_name, $translation);
 
-                Bus::chain($batch)->onQueue('default')->dispatch();
+                Bus::chain($batch)->onQueue('jobs')->dispatch();
 
                 $message = trans('messages.success.download_queued', ['type' => $translation]);
 
@@ -314,7 +314,7 @@ abstract class BulkAction
             } else {
                 $this->dispatch(new CreateZipForDownload($selected, $class, $file_name));
 
-                $folder_path = 'app/temp/' . company_id() . '/bulk_actions/';
+                $folder_path = 'app' . DIRECTORY_SEPARATOR . 'temp' . DIRECTORY_SEPARATOR . company_id() . DIRECTORY_SEPARATOR . 'bulk_actions' . DIRECTORY_SEPARATOR;
 
                 return response()->download(get_storage_path($folder_path . $file_name . '.zip'))->deleteFileAfterSend(true);
             }

app/Abstracts/Http/Controller.php

@@ -16,6 +16,9 @@ use Illuminate\Pagination\Paginator;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Routing\Controller as BaseController;
 
+/**
+ * @property string $type
+ */
 abstract class Controller extends BaseController
 {
     use AuthorizesRequests, Jobs, Permissions, Relationships, SearchString, ValidatesRequests;
@@ -114,6 +117,19 @@ abstract class Controller extends BaseController
             }
         }
 
+        if (! request()->has('list_records') && request()->has('search')) {
+            $status = $this->getSearchStringValue('status');
+
+            if (empty($status)) {
+                $tab_pins = setting('favorites.tab.' . user()->id, []);
+                $tab_pins = ! empty($tab_pins) ? json_decode($tab_pins, true) : [];
+
+                if (! empty($tab_pins) && (($tab_pins[$this->type] ?? null) === 'all')) {
+                    request()->offsetSet('list_records', 'all');
+                }
+            }
+        }
+
         if (request()->get('list_records') == 'all') {
             return;
         }
@@ -152,5 +168,105 @@ abstract class Controller extends BaseController
                 }
             }
         }
+
+        if (! request()->has('list_records') && request()->has('search')) {
+            $type = $this->getSearchStringValue('type');
+
+            if (empty($type)) {
+                $tab_pins = setting('favorites.tab.' . user()->id, []);
+                $tab_pins = ! empty($tab_pins) ? json_decode($tab_pins, true) : [];
+
+                if (! empty($tab_pins) && (($tab_pins['transactions'] ?? null) === 'all')) {
+                    request()->offsetSet('list_records', 'all');
+                }
+            }
+        }
+
+        if (request()->get('list_records') == 'all') {
+            return;
+        }
+
+        $type = $this->getSearchStringValue('type');
+
+        if (empty($type)) {
+            $search = config('type.transaction.transactions.route.params.income.search');
+
+            request()->offsetSet('search', $search);
+            request()->offsetSet('programmatic', '1');
+        } else {
+            $income = str_replace('type:', 'income', config('type.transaction.transactions.route.params.income.search'));
+            $expense = str_replace('type:', 'expense', config('type.transaction.transactions.route.params.expense.search'));
+
+            if (($type == $income) || ($type == $expense)) {
+                return;
+            }
+
+            request()->offsetSet('list_records', 'all');
+        }
+    }
+
+    public function setActiveTabForCategories(): void
+    {
+        if (! request()->has('list_records') && ! request()->has('search')) {
+            $tab_pins = setting('favorites.tab.' . user()->id, []);
+            $tab_pins = ! empty($tab_pins) ? json_decode($tab_pins, true) : [];
+
+            if (! empty($tab_pins) && ! empty($tab_pins['categories'])) {
+                $tab = $tab_pins['categories'];
+
+                if (! empty($tab)) {
+
+                    request()->offsetSet('list_records', $tab);
+                    request()->offsetSet('programmatic', '1');
+                }
+            }
+        }
+
+        if (! request()->has('list_records') && request()->has('search')) {
+            $type = $this->getSearchStringValue('type');
+
+            if (empty($type)) {
+                $tab_pins = setting('favorites.tab.' . user()->id, []);
+                $tab_pins = ! empty($tab_pins) ? json_decode($tab_pins, true) : [];
+
+                if (! empty($tab_pins) && (($tab_pins['categories'] ?? null) === 'all')) {
+                    request()->offsetSet('list_records', 'all');
+                }
+            }
+        }
+
+        if (request()->get('list_records') == 'all') {
+            return;
+        }
+
+        $types = $this->getSearchStringValue('type');
+
+        if (!empty($types)) {
+            $types = is_string($types) ? explode(',', $types) : $types;
+
+            $tab = config('type.category.' . $types[0] . '.group') ? config('type.category.' . $types[0] . '.group') : 'all';
+
+            if (!empty($types) && count($types) > 0) {
+                request()->offsetSet('list_records', $tab);
+
+                $currentSearch = request('search', '');
+
+                $searchParts = array_filter(explode(' ', $currentSearch), function($part) {
+                    return !empty(trim($part)) && !str_starts_with(trim($part), 'type:');
+                });
+
+                $searchParts[] = 'type:' . implode(',', $types);
+
+                request()->offsetSet('search', implode(' ', $searchParts));
+                request()->offsetSet('programmatic', '1');
+
+                return;
+            }
+        }
+
+        if (empty($tab)) {
+            request()->offsetSet('list_records', 'all');
+            request()->offsetSet('programmatic', '1');
+        }
     }
 }

app/Abstracts/Import.php

@@ -70,8 +70,11 @@ abstract class Import implements HasLocalePreference, ShouldQueue, SkipsEmptyRow
             }
 
             try {
-                $row[$date_field] = Date::parse(ExcelDate::excelToDateTimeObject($row[$date_field]))
-                                        ->format('Y-m-d H:i:s');
+                $row[$date_field] = is_numeric($row[$date_field]) 
+                                    ? Date::parse(ExcelDate::excelToDateTimeObject($row[$date_field]))
+                                            ->format('Y-m-d H:i:s')
+                                    : Date::parse($row[$date_field])
+                                            ->format('Y-m-d H:i:s');
             } catch (InvalidFormatException | \Exception $e) {
                 Log::info($e->getMessage());
             }
@@ -119,7 +122,18 @@ abstract class Import implements HasLocalePreference, ShouldQueue, SkipsEmptyRow
             } catch (ValidationException $e) {
                 foreach ($e->validator->failed() as $attribute => $value) {
                     foreach ($value as $rule => $params) {
-                        $validator->addFailure($row . '.' . $attribute, $rule, $params);
+                        if ($rule === 'In' && !empty($params)) {
+                            $actual_value = $data[$attribute] ?? 'null';
+                            $expected_values = implode(', ', $params);
+                            $custom_message = trans('validation.in_detailed', [
+                                'attribute' => $attribute,
+                                'value' => $actual_value,
+                                'values' => $expected_values
+                            ]);
+                            $validator->errors()->add($row . '.' . $attribute, $custom_message);
+                        } else {
+                            $validator->addFailure($row . '.' . $attribute, $rule, $params);
+                        }
                     }
                 }
 

app/Abstracts/Listeners/Report.php

@@ -5,13 +5,14 @@ namespace App\Abstracts\Listeners;
 use App\Models\Banking\Account;
 use App\Models\Common\Contact;
 use App\Models\Setting\Category;
+use App\Traits\Categories;
 use App\Traits\Contacts;
 use App\Traits\DateTime;
 use App\Traits\SearchString;
 
 abstract class Report
 {
-    use Contacts, DateTime, SearchString;
+    use Categories, Contacts, DateTime, SearchString;
 
     protected $classes = [];
 
@@ -90,22 +91,24 @@ abstract class Report
 
     public function getItemCategories($limit = false)
     {
-        return $this->getCategories('item', $limit);
+        return $this->getCategories($this->getItemCategoryTypes(), $limit);
     }
 
     public function getIncomeCategories($limit = false)
     {
-        return $this->getCategories('income', $limit);
+        return $this->getCategories($this->getIncomeCategoryTypes(), $limit);
     }
 
     public function getExpenseCategories($limit = false)
     {
-        return $this->getCategories('expense', $limit);
+        return $this->getCategories($this->getExpenseCategoryTypes(), $limit);
     }
 
     public function getIncomeExpenseCategories($limit = false)
     {
-        return $this->getCategories(['income', 'expense'], $limit);
+        $types = array_merge($this->getIncomeCategoryTypes(), $this->getExpenseCategoryTypes());
+
+        return $this->getCategories($types, $limit);
     }
 
     public function getCategories($types, $limit = false)
@@ -158,11 +161,42 @@ abstract class Report
         ];
     }
 
+    public function getDiscount()
+    {
+        return [
+            'item' => trans('settings.localisation.discount_location.item'),
+            'total' => trans('settings.localisation.discount_location.total'),
+            'both' => trans('settings.localisation.discount_location.both'),
+        ];
+    }
+
     public function applyDateFilter($event)
     {
         $event->model->dateFilter($event->args['date_field']);
     }
 
+    public function applyDiscountFilter($event)
+    {
+        $input = request('search', '');
+        $discount = $this->getSearchStringValue('discount', 'both', $input);
+
+        switch ($discount) {
+            case 'item':
+                $discount_types = ['item_discount'];
+                break;
+            case 'total':
+                $discount_types = ['discount'];
+                break;
+            default:
+                $discount_types = ['item_discount', 'discount'];
+                break;
+        }
+
+        $event->model->whereHas('totals', function ($query) use ($discount_types) {
+            $query->whereIn('code', $discount_types);
+        });
+    }
+
     public function applySearchStringFilter($event)
     {
         $input = request('search', '');

app/Abstracts/Model.php

@@ -246,6 +246,15 @@ abstract class Model extends Eloquent implements Ownable
         return $query->where($this->qualifyColumn('type'), 'not like', '%-recurring');
     }
 
+    public function scopeModuleEnabled(Builder $query, string $module): Builder
+    {
+        return $query->allCompanies()->whereHas('company', fn (Builder $q1) =>
+            $q1->enabled()->whereHas('modules', fn (Builder $q2) =>
+                $q2->allCompanies()->alias($module)->enabled(),
+            )
+        );
+    }
+
     public function ownerKey($owner)
     {
         if ($this->isNotOwnable()) {

app/Abstracts/Report.php

@@ -40,6 +40,8 @@ abstract class Report
 
     public $has_money = true;
 
+    public $group;
+
     public $groups = [];
 
     public $year;
@@ -251,7 +253,7 @@ abstract class Report
 
     public function show()
     {
-        return view($this->views['show'])->with('class', $this);
+        return view($this->views['show'], ['print' => false])->with('class', $this);
     }
 
     public function print()
@@ -259,6 +261,41 @@ abstract class Report
         return view($this->views['print'], ['print' => true])->with('class', $this);
     }
 
+    public function array(): array
+    {
+        $data = [];
+
+        $group = Str::plural($this->group ?? $this->getSetting('group'));
+
+        foreach ($this->tables as $table_key => $table_name) {
+            if (! isset($this->row_values[$table_key])) {
+                continue;
+            }
+
+            foreach ($this->row_values[$table_key] as $key => $values) {
+                if (empty($this->row_names[$table_key][$key])) {
+                    continue;
+                }
+
+                if ($this->has_money) {
+                    $values = array_map(fn($value) => money($value)->format(), $values);
+                }
+
+                $data[$table_key][$group][$this->row_names[$table_key][$key]] = $values;
+            }
+
+            $footer_totals = $this->footer_totals[$table_key];
+
+            if ($this->has_money) {
+                $footer_totals = array_map(fn($value) => money($value)->format(), $footer_totals);
+            }
+
+            $data[$table_key]['totals'] = $footer_totals;
+        }
+
+        return $data;
+    }
+
     public function pdf()
     {
         $view = view($this->views['print'], ['print' => true])->with('class', $this)->render();
@@ -509,11 +546,19 @@ abstract class Report
 
     public function divArithmeticAmount(&$current, $amount)
     {
+        if ($amount == 0) {
+            throw new \InvalidArgumentException('Division by zero is not allowed');
+        }
+
         $current = $current / $amount;
     }
 
     public function modArithmeticAmount(&$current, $amount)
     {
+        if ($amount == 0) {
+            throw new \InvalidArgumentException('Modulo by zero is not allowed');
+        }
+
         $current = $current % $amount;
     }
 
@@ -551,7 +596,6 @@ abstract class Report
             $url .= $parameters;
         }
 
-
         return $url;
     }
 
@@ -570,6 +614,11 @@ abstract class Report
         return $this->getSearchStringValue('period', $this->getSetting('period'));
     }
 
+    public function getDiscount()
+    {
+        return $this->getSearchStringValue('discount');
+    }
+
     public function getFields()
     {
         return [

app/Abstracts/View/Components/Contacts/Index.php

@@ -30,6 +30,10 @@ abstract class Index extends Component
     public $page;
 
     public $permissionCreate;
+
+    public $permissionUpdate;
+
+    public $permissionDelete;
     /* -- Main End -- */
 
     /* -- Buttons Start -- */

app/Abstracts/View/Components/Documents/Index.php

@@ -483,6 +483,7 @@ abstract class Index extends Component
                 'text'          => trans('general.title.new', ['type' => trans_choice($this->textPage ?? 'general.' . $prefix, 1)]),
                 'description'   => trans('general.empty.actions.new', ['type' => strtolower(trans_choice($this->textPage ?? 'general.' . $prefix, 1))]),
                 'active_badge'  => true,
+                'stack'         => 'create_button',
             ];
         }
 
@@ -494,6 +495,7 @@ abstract class Index extends Component
                 'url'           => route($this->importRoute, $this->importRouteParameters),
                 'text'          => trans('import.title', ['type' => trans_choice($this->textPage ?? 'general.' . $prefix, 2)]),
                 'description'   => trans('general.empty.actions.import', ['type' => strtolower(trans_choice($this->textPage ?? 'general.' . $prefix, 2))]),
+                'stack'         => 'import_button',
             ];
         }
 

app/Abstracts/View/Components/Form.php

@@ -93,6 +93,12 @@ abstract class Form extends Component
     /** @var string */
     public $inputGroupClass = '';
 
+    /** @var string */
+    public $icon = '';
+
+    /** @var string */
+    public $trailing = '';
+
     /** @var array */
     public $custom_attributes = [];
 
@@ -112,7 +118,7 @@ abstract class Form extends Component
         $options = [], $option = [], string $optionKey = 'id', string $optionValue = 'name', $fullOptions = [], $checked = null, $checkedKey = null, $selected = null, $selectedKey = null, $rows = '3',
         $remote = false, $multiple = false, $addNew = false, $group = false,
         bool $searchable = false, bool $disabled = false, bool $readonly = false, bool $required = true, bool $notRequired = false,
-        string $formGroupClass = '', string $inputGroupClass = '',
+        string $formGroupClass = '', string $inputGroupClass = '', $icon = '', $trailing = '',
         $dynamicAttributes = '',
         bool $hideCurrency = false
     ) {
@@ -146,6 +152,9 @@ abstract class Form extends Component
         $this->formGroupClass = $this->getFromGroupClass($formGroupClass);
         $this->inputGroupClass = $this->getInputGroupClass($inputGroupClass);
 
+        $this->icon = $icon;
+        $this->trailing = $trailing;
+
         $this->custom_attributes = $this->getCustomAttributes();
 
         $this->setDynamicAttributes($dynamicAttributes);

app/Abstracts/View/Components/Transactions/Show.php

@@ -304,6 +304,9 @@ abstract class Show extends Component
     /** @var bool */
     public $hideRecurringMessage;
 
+    /** @var bool */
+    public $hideConnectMessage;
+
     /** @var bool */
     public $hideCreated;
 
@@ -335,7 +338,7 @@ abstract class Show extends Component
         string $routeDocumentShow = '', string $routeTransactionShow = '', string $textButtonAddNew = '',
 
         bool $hideSchedule = false, bool $hideChildren = false, bool $hideConnect = false, bool $hideTransfer = false, bool $hideAttachment = false, $attachment = [],
-        array $connectTranslations = [], string $textRecurringType = '', bool $hideRecurringMessage = false, bool $hideCreated = false
+        array $connectTranslations = [], string $textRecurringType = '', bool $hideRecurringMessage = false, $hideConnectMessage = false, bool $hideCreated = false
     ) {
         $this->type = $type;
         $this->transaction = $transaction;
@@ -472,6 +475,7 @@ abstract class Show extends Component
 
         // Connect translations
         $this->connectTranslations = $this->getTranslationsForConnect($type);
+        $this->hideConnectMessage = $hideConnectMessage;
 
         $this->textRecurringType = $this->getTextRecurringType($type, $textRecurringType);
         $this->hideRecurringMessage = $hideRecurringMessage;

app/Abstracts/Widget.php

@@ -28,6 +28,8 @@ abstract class Widget
         'header' => 'components.widgets.header',
     ];
 
+    public array $data = [];
+
     public function __construct($model = null)
     {
         $this->model = $model;

app/BulkActions/Settings/Categories.php

@@ -53,6 +53,7 @@ class Categories extends BulkAction
     public function edit($request)
     {
         $selected = $this->getSelectedInput($request);
+
         $types = $this->getCategoryTypes();
 
         return $this->response('bulk-actions.settings.categories.edit', compact('selected', 'types'));

app/Console/Commands/RecurringCheck.php

@@ -218,12 +218,14 @@ class RecurringCheck extends Command
         $model->created_from = 'core::recurring';
         $model->save();
 
+        $this->updateRelationTypes($model, $template->cloneable_relations);
+
         return $model;
     }
 
     protected function getTransactionModel(Transaction $template, Date $schedule_date): Transaction
     {
-        $template->cloneable_relations = [];
+        $template->cloneable_relations = ['taxes'];
 
         $model = $template->duplicate();
 
@@ -233,6 +235,8 @@ class RecurringCheck extends Command
         $model->created_from = 'core::recurring';
         $model->save();
 
+        $this->updateRelationTypes($model, $template->cloneable_relations);
+
         return $model;
     }
 
@@ -266,4 +270,15 @@ class RecurringCheck extends Command
     {
         return Str::replace('-recurring', '', $recurring_type);
     }
+
+    public function updateRelationTypes($model, $relations)
+    {
+        foreach ($relations as $relation) {
+            if (! method_exists($model, $relation)) {
+                continue;
+            }
+
+            $model->$relation()->update(['type' => $model->type]);
+        }
+    }
 }

app/Exceptions/Handler.php

@@ -116,9 +116,9 @@ class Handler extends ExceptionHandler
      */
     protected function unauthenticated($request, AuthenticationException $exception)
     {
-        // Store the current url in the session
-        if ($request->url() !== config('app.url')) {
-            session(['url.intended' => $request->url()]);
+        // Store the current url in the session (fullUrl includes query string)
+        if ($request->fullUrl() !== config('app.url')) {
+            session(['url.intended' => $request->fullUrl()]);
         }
 
         return $request->expectsJson()

app/Exports/Purchases/Bills/Sheets/BillItems.php

@@ -37,6 +37,8 @@ class BillItems extends Export implements WithParentSheet
             'item_description',
             'item_type',
             'quantity',
+            'discount_type',
+            'discount_rate',
             'price',
             'total',
             'tax',

app/Exports/Purchases/RecurringBills/Sheets/RecurringBillItems.php

@@ -37,6 +37,8 @@ class RecurringBillItems extends Export implements WithParentSheet
             'item_description',
             'item_type',
             'quantity',
+            'discount_type',
+            'discount_rate',
             'price',
             'total',
             'tax',

app/Exports/Sales/Invoices/Sheets/InvoiceItems.php

@@ -37,6 +37,8 @@ class InvoiceItems extends Export implements WithParentSheet
             'item_description',
             'item_type',
             'quantity',
+            'discount_type',
+            'discount_rate',
             'price',
             'total',
             'tax',

app/Exports/Sales/RecurringInvoices/Sheets/RecurringInvoiceItems.php

@@ -37,6 +37,8 @@ class RecurringInvoiceItems extends Export implements WithParentSheet
             'item_description',
             'item_type',
             'quantity',
+            'discount_type',
+            'discount_rate',
             'price',
             'total',
             'tax',

app/Exports/Settings/Categories.php

@@ -25,9 +25,11 @@ class Categories extends Export
     public function fields(): array
     {
         return [
+            'code',
             'name',
             'type',
             'color',
+            'description',
             'parent_name',
             'enabled',
         ];

app/Http/Controllers/Api/Banking/Transactions.php

@@ -43,6 +43,10 @@ class Transactions extends ApiController
      */
     public function store(Request $request)
     {
+        if ($request->has('document_id')) {
+            return $this->errorBadRequest(trans('transactions.messages.create_document_transaction_error'));
+        }
+
         $transaction = $this->dispatch(new CreateTransaction($request));
 
         return $this->created(route('api.transactions.show', $transaction->id), new Resource($transaction));
@@ -57,6 +61,10 @@ class Transactions extends ApiController
      */
     public function update(Transaction $transaction, Request $request)
     {
+        if ($request->has('document_id')) {
+            return $this->errorBadRequest(trans('transactions.messages.update_document_transaction_error'));
+        }
+
         $transaction = $this->dispatch(new UpdateTransaction($transaction, $request));
 
         return new Resource($transaction->fresh());
@@ -70,6 +78,10 @@ class Transactions extends ApiController
      */
     public function destroy(Transaction $transaction)
     {
+        if ($transaction->document_id) {
+            return $this->errorBadRequest(trans('transactions.messages.delete_document_transaction_error'));
+        }
+
         try {
             $this->dispatch(new DeleteTransaction($transaction));
 

app/Http/Controllers/Api/Document/DocumentTransactions.php

@@ -6,6 +6,7 @@ use App\Abstracts\Http\ApiController;
 use App\Http\Requests\Banking\Transaction as Request;
 use App\Http\Resources\Banking\Transaction as Resource;
 use App\Jobs\Banking\CreateBankingDocumentTransaction;
+use App\Jobs\Banking\UpdateBankingDocumentTransaction;
 use App\Jobs\Banking\DeleteTransaction;
 use App\Models\Banking\Transaction;
 use App\Models\Document\Document;
@@ -32,7 +33,7 @@ class DocumentTransactions extends ApiController
      */
     public function index($document_id)
     {
-        $transactions = Transaction::documentId($document_id)->get();
+        $transactions = Transaction::with(['document', 'taxes'])->documentId($document_id)->get();
 
         return Resource::collection($transactions);
     }
@@ -46,7 +47,7 @@ class DocumentTransactions extends ApiController
      */
     public function show($document_id, $id)
     {
-        $transaction = Transaction::documentId($document_id)->find($id);
+        $transaction = Transaction::with(['document', 'taxes'])->documentId($document_id)->find($id);
 
         if (! $transaction instanceof Transaction) {
             return $this->errorInternal('No query results for model [' . Transaction::class . '] ' . $id);
@@ -71,6 +72,25 @@ class DocumentTransactions extends ApiController
         return $this->created(route('api.documents.transactions.show', [$document_id, $transaction->id]), new Resource($transaction));
     }
 
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  $document_id
+     * @param  $id
+     * @param  $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function update($document_id, $id, Request $request)
+    {
+        $document = Document::find($document_id);
+
+        $transaction = Transaction::documentId($document_id)->find($id);
+
+        $transaction = $this->dispatch(new UpdateBankingDocumentTransaction($document, $transaction, $request));
+
+        return $this->created(route('api.documents.transactions.show', [$document_id, $transaction->id]), new Resource($transaction));
+    }
+
     /**
      * Remove the specified resource from storage.
      *

app/Http/Controllers/Api/Document/Documents.php

@@ -19,7 +19,7 @@ class Documents extends ApiController
      */
     public function index()
     {
-        $documents = Document::with('contact', 'histories', 'items', 'transactions')->collect(['issued_at'=> 'desc']);
+        $documents = Document::with('contact', 'histories', 'items', 'item_taxes', 'totals', 'transactions')->collect(['issued_at'=> 'desc']);
 
         return Resource::collection($documents);
     }
@@ -34,9 +34,33 @@ class Documents extends ApiController
     {
         // Check if we're querying by id or number
         if (is_numeric($id)) {
-            $document = Document::find($id);
+            $document = Document::with([
+                'contact',
+                'histories',
+                'items',
+                'items.taxes',
+                'items.taxes.tax',
+                'item_taxes',
+                'totals',
+                'transactions',
+                'transactions.currency',
+                'transactions.account',
+                'transactions.category',
+            ])->find($id);
         } else {
-            $document = Document::where('document_number', $id)->first();
+            $document = Document::with([
+                'contact',
+                'histories',
+                'items',
+                'items.taxes',
+                'items.taxes.tax',
+                'item_taxes',
+                'totals',
+                'transactions',
+                'transactions.currency',
+                'transactions.account',
+                'transactions.category',
+            ])->where('document_number', $id)->first();
         }
 
         if (! $document instanceof Document) {

app/Http/Controllers/Banking/RecurringTransactions.php

@@ -13,9 +13,11 @@ use App\Models\Banking\Account;
 use App\Models\Banking\Transaction;
 use App\Models\Common\Recurring;
 use App\Models\Setting\Currency;
+use App\Models\Setting\Tax;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
 use App\Traits\Transactions as TransactionsTrait;
+use App\Utilities\Date;
 
 class RecurringTransactions extends Controller
 {
@@ -76,13 +78,16 @@ class RecurringTransactions extends Controller
 
         $currency = Currency::where('code', $account_currency_code)->first();
 
+        $taxes = Tax::enabled()->orderBy('name')->get();
+
         return view('banking.recurring_transactions.create', compact(
             'type',
             'real_type',
             'number',
             'contact_type',
             'account_currency_code',
-            'currency'
+            'currency',
+            'taxes'
         ));
     }
 
@@ -95,7 +100,9 @@ class RecurringTransactions extends Controller
      */
     public function store(Request $request)
     {
-        $response = $this->ajaxDispatch(new CreateTransaction($request->merge(['paid_at' => $request->get('recurring_started_at')])));
+        $request->merge(['paid_at' => $request->get('recurring_started_at')]);
+
+        $response = $this->ajaxDispatch(new CreateTransaction($request));
 
         if ($response['success']) {
             $response['redirect'] = route('recurring-transactions.show', $response['data']->id);
@@ -173,6 +180,8 @@ class RecurringTransactions extends Controller
 
         $currency = Currency::where('code', $recurring_transaction->currency_code)->first();
 
+        $taxes = Tax::enabled()->orderBy('name')->get();
+
         $date_format = $this->getCompanyDateFormat();
 
         return view('banking.recurring_transactions.edit', compact(
@@ -182,6 +191,7 @@ class RecurringTransactions extends Controller
             'contact_type',
             'recurring_transaction',
             'currency',
+            'taxes',
             'date_format'
         ));
     }
@@ -196,7 +206,9 @@ class RecurringTransactions extends Controller
      */
     public function update(Transaction $recurring_transaction, Request $request)
     {
-        $response = $this->ajaxDispatch(new UpdateTransaction($recurring_transaction, $request->merge(['paid_at' => $request->get('recurring_started_at')])));
+        $request->merge(['paid_at' => $request->get('recurring_started_at')]);
+
+        $response = $this->ajaxDispatch(new UpdateTransaction($recurring_transaction, $request));
 
         if ($response['success']) {
             $response['redirect'] = route('recurring-transactions.show', $recurring_transaction->id);

app/Http/Controllers/Banking/Transactions.php

@@ -39,7 +39,7 @@ class Transactions extends Controller
     {
         $this->setActiveTabForTransactions();
 
-        $transactions = Transaction::with('account', 'category', 'contact')->collect(['paid_at'=> 'desc']);
+        $transactions = Transaction::with('account', 'category', 'contact', 'taxes')->collect(['paid_at'=> 'desc']);
 
         $total_transactions = Transaction::count();
 
@@ -239,6 +239,19 @@ class Transactions extends Controller
      */
     public function update(Transaction $transaction, Request $request)
     {
+        if ($transaction->document_id) {
+            $message = trans('transactions.messages.update_document_transaction');
+
+            flash($message)->error()->important();
+
+            return response()->json([
+                'success' => false,
+                'error' => true,
+                'message' => $message,
+                'redirect' => route('transactions.edit', $transaction->id),
+            ]);
+        }
+
         $response = $this->ajaxDispatch(new UpdateTransaction($transaction, $request));
 
         if ($response['success']) {
@@ -333,7 +346,9 @@ class Transactions extends Controller
     {
         event(new TransactionPrinting($transaction));
 
-        $view = view('banking.transactions.print_default', compact('transaction'));
+        $real_type = $this->getRealTypeTransaction($transaction->type);
+
+        $view = view('banking.transactions.print_default', compact('transaction', 'real_type'));
 
         return mb_convert_encoding($view, 'HTML-ENTITIES', 'UTF-8');
     }
@@ -351,7 +366,9 @@ class Transactions extends Controller
 
         $currency_style = true;
 
-        $view = view('banking.transactions.print_default', compact('transaction', 'currency_style'))->render();
+        $real_type = $this->getRealTypeTransaction($transaction->type);
+
+        $view = view('banking.transactions.print_default', compact('transaction', 'currency_style', 'real_type'))->render();
         $html = mb_convert_encoding($view, 'HTML-ENTITIES', 'UTF-8');
 
         $pdf = app('dompdf.wrapper');
@@ -395,7 +412,7 @@ class Transactions extends Controller
         $translations = collect($this->getTranslationsForConnect($transaction->type));
 
         $data = [
-            'transaction' => $transaction->load(['account', 'category'])->toJson(),
+            'transaction' => $transaction->load(['account', 'category', 'taxes'])->toJson(),
             'currency' => $transaction->currency->toJson(),
             'documents' => $documents,
             'translations' => $translations->toJson(),

app/Http/Controllers/Common/Dashboards.php

@@ -37,7 +37,8 @@ class Dashboards extends Controller
      */
     public function index()
     {
-        $dashboards = user()->dashboards()->collect();
+        // Eager load users relationship to prevent N+1 queries in dashboard index view
+        $dashboards = user()->dashboards()->with('users')->collect();
 
         return $this->response('common.dashboards.index', compact('dashboards'));
     }

app/Http/Controllers/Common/Items.php

@@ -245,11 +245,12 @@ class Items extends Controller
             $currency_code = default_currency();
         }
 
-        $autocomplete = Item::autocomplete([
+        $autocomplete = Item::with('taxes')->autocomplete([
             'name' => $query
         ]);
 
-        $items = $autocomplete->get();
+        // Eager load taxes and tax relationships to prevent N+1 queries
+        $items = $autocomplete->with(['taxes.tax'])->get();
 
         if ($items) {
             foreach ($items as $item) {
@@ -260,6 +261,7 @@ class Items extends Controller
                     $inclusives = $compounds = [];
 
                     foreach($item->taxes as $item_tax) {
+                        // Tax relationship is now eager loaded, preventing N+1 query
                         $tax = $item_tax->tax;
 
                         switch ($tax->type) {

app/Http/Controllers/Common/Reports.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Common;
 
 use App\Abstracts\Http\Controller;
 use App\Http\Requests\Common\Report as Request;
+use App\Http\Requests\Common\ReportShow as ShowRequest;
 use App\Jobs\Common\CreateReport;
 use App\Jobs\Common\DeleteReport;
 use App\Jobs\Common\UpdateReport;
@@ -66,9 +67,10 @@ class Reports extends Controller
      * Show the form for viewing the specified resource.
      *
      * @param  Report $report
+     * @param  ShowRequest $request
      * @return Response
      */
-    public function show(Report $report)
+    public function show(Report $report, ShowRequest $request)
     {
         if (Utility::cannotShow($report->class)) {
             abort(403);

app/Http/Controllers/Modals/Categories.php

@@ -6,10 +6,14 @@ use App\Abstracts\Http\Controller;
 use App\Http\Requests\Setting\Category as Request;
 use App\Jobs\Setting\CreateCategory;
 use App\Models\Setting\Category;
+use App\Traits\Categories as Helper;
+use App\Traits\Modules;
 use Illuminate\Http\Request as IRequest;
 
 class Categories extends Controller
 {
+    use Helper, Modules;
+
     /**
      * Instantiate a new controller instance.
      */
@@ -29,19 +33,29 @@ class Categories extends Controller
      */
     public function create(IRequest $request)
     {
-        $type = $request->get('type', 'item');
+        $type = $request->get('type', Category::ITEM_TYPE);
+
+        $category_types = $this->getTypeCategoryTypes($type);
+        $hide_code_types = $this->hideCodeCategoryTypes($category_types);
 
         $categories = collect();
 
-        Category::type($type)->enabled()->orderBy('name')->get()->each(function ($category) use (&$categories) {
-            $categories->push([
-                'id' => $category->id,
-                'title' => $category->name,
-                'level' => $category->level,
-            ]);
-        });
+        Category::type($category_types)
+            ->enabled()
+            ->orderBy('name')
+            ->get()
+            ->each(function ($category) use (&$categories) {
+                $categories->push([
+                    'id' => $category->id,
+                    'title' => $category->name,
+                    'level' => $category->level,
+                ]);
+            });
 
-        $html = view('modals.categories.create', compact('type', 'categories'))->render();
+        $type_group = count($category_types) > 1 ? true : false;
+        $types = $this->getCategoryTypes(group: true, types: $category_types);
+
+        $html = view('modals.categories.create', compact('type', 'types', 'categories', 'type_group', 'hide_code_types'))->render();
 
         return response()->json([
             'success' => true,
@@ -61,7 +75,7 @@ class Categories extends Controller
     public function store(Request $request)
     {
         $request['enabled'] = 1;
-        $request['type'] = $request->get('type', 'income');
+        $request['type'] = $request->get('type', Category::ITEM_TYPE);
         $request['color'] = $request->get('color', '#' . dechex(rand(0x000000, 0xFFFFFF)));
 
         $response = $this->ajaxDispatch(new CreateCategory($request));

app/Http/Controllers/Modals/DocumentTransactions.php

@@ -42,6 +42,8 @@ class DocumentTransactions extends Controller
      */
     public function create(Document $document)
     {
+        $document->load(['totals', 'transactions']);
+
         $currency = Currency::where('code', $document->currency_code)->first();
 
         $paid = $document->paid;
@@ -149,6 +151,8 @@ class DocumentTransactions extends Controller
      */
     public function edit(Document $document, Transaction $transaction)
     {
+        $document->load(['totals', 'transactions']);
+
         $currency = Currency::where('code', $document->currency_code)->first();
 
         // if you edit transaction before remove transaction amount

app/Http/Controllers/Portal/Invoices.php

@@ -44,6 +44,20 @@ class Invoices extends Controller
      */
     public function show(Document $invoice, Request $request)
     {
+        $invoice->load([
+            'items.taxes.tax',
+            'items.item',
+            'totals',
+            'contact',
+            'currency',
+            'category',
+            'histories',
+            'media',
+            'transactions',
+            'recurring',
+            'children',
+        ]);
+
         $payment_methods = Modules::getPaymentMethods();
 
         event(new \App\Events\Document\DocumentViewed($invoice));

app/Http/Controllers/Portal/Payments.php

@@ -69,7 +69,10 @@ class Payments extends Controller
         event(new TransactionPrinting($payment));
 
         $transaction = $payment;
-        $view = view('banking.transactions.print_default', compact('transaction'));
+
+        $real_type = $this->getRealTypeTransaction($transaction->type);
+
+        $view = view('banking.transactions.print_default', compact('transaction', 'real_type'));
 
         return mb_convert_encoding($view, 'HTML-ENTITIES', 'UTF-8');
     }
@@ -88,7 +91,10 @@ class Payments extends Controller
         $currency_style = true;
 
         $transaction = $payment;
-        $view = view('banking.transactions.print_default', compact('transaction', 'currency_style'))->render();
+
+        $real_type = $this->getRealTypeTransaction($transaction->type);
+
+        $view = view('banking.transactions.print_default', compact('transaction', 'currency_style', 'real_type'))->render();
         $html = mb_convert_encoding($view, 'HTML-ENTITIES', 'UTF-8');
 
         $pdf = app('dompdf.wrapper');

app/Http/Controllers/Purchases/Bills.php

@@ -45,6 +45,20 @@ class Bills extends Controller
      */
     public function show(Document $bill)
     {
+        $bill->load([
+            'items.taxes.tax',
+            'items.item',
+            'totals',
+            'contact',
+            'currency',
+            'category',
+            'histories',
+            'media',
+            'transactions',
+            'recurring',
+            'children',
+        ]);
+
         return view('purchases.bills.show', compact('bill'));
     }
 

app/Http/Controllers/Purchases/RecurringBills.php

@@ -13,6 +13,7 @@ use App\Jobs\Document\UpdateDocument;
 use App\Models\Common\Recurring;
 use App\Models\Document\Document;
 use App\Traits\Documents;
+use App\Utilities\Date;
 
 class RecurringBills extends Controller
 {
@@ -80,7 +81,11 @@ class RecurringBills extends Controller
      */
     public function store(Request $request)
     {
-        $response = $this->ajaxDispatch(new CreateDocument($request->merge(['issued_at' => $request->get('recurring_started_at')])));
+        $issue_at = Date::parse($request->get('recurring_started_at'))->format('Y-m-d');
+
+        $request->merge(['issued_at' => $issue_at]);
+
+        $response = $this->ajaxDispatch(new CreateDocument($request));
 
         if ($response['success']) {
             $response['redirect'] = route('recurring-bills.show', $response['data']->id);
@@ -163,7 +168,11 @@ class RecurringBills extends Controller
      */
     public function update(Document $recurring_bill, Request $request)
     {
-        $response = $this->ajaxDispatch(new UpdateDocument($recurring_bill, $request->merge(['issued_at' => $request->get('recurring_started_at')])));
+        $issue_at = Date::parse($request->get('recurring_started_at'))->format('Y-m-d');
+
+        $request->merge(['issued_at' => $issue_at]);
+
+        $response = $this->ajaxDispatch(new UpdateDocument($recurring_bill, $request));
 
         if ($response['success']) {
             $response['redirect'] = route('recurring-bills.show', $response['data']->id);

app/Http/Controllers/Purchases/Vendors.php

@@ -30,7 +30,20 @@ class Vendors extends Controller
      */
     public function index()
     {
-        $vendors = Contact::with('media', 'bills.histories', 'bills.totals', 'bills.transactions', 'bills.media')->vendor()->collect();
+        $vendors = Contact::with([
+                'media',
+                'bills.histories',
+                'bills.totals',
+                'bills.transactions',
+                'bills.media'
+            ])
+            ->withCount([
+                'contact_persons as contact_persons_with_email_count' => function ($query) {
+                    $query->whereNotNull('email');
+                }
+            ])
+            ->vendor()
+            ->collect();
 
         return $this->response('purchases.vendors.index', compact('vendors'));
     }

app/Http/Controllers/Sales/Customers.php

@@ -30,7 +30,20 @@ class Customers extends Controller
      */
     public function index()
     {
-        $customers = Contact::customer()->with('media', 'invoices.histories', 'invoices.totals', 'invoices.transactions', 'invoices.media')->collect();
+        $customers = Contact::customer()
+            ->with([
+                'media',
+                'invoices.histories',
+                'invoices.totals',
+                'invoices.transactions',
+                'invoices.media'
+            ])
+            ->withCount([
+                'contact_persons as contact_persons_with_email_count' => function ($query) {
+                    $query->whereNotNull('email');
+                }
+            ])
+            ->collect();
 
         return $this->response('sales.customers.index', compact('customers'));
     }

app/Http/Controllers/Sales/Invoices.php

@@ -31,7 +31,7 @@ class Invoices extends Controller
     {
         $this->setActiveTabForDocuments();
 
-        $invoices = Document::invoice()->with('contact', 'items', 'item_taxes', 'last_history', 'transactions', 'totals', 'histories', 'media')->collect(['document_number'=> 'desc']);
+        $invoices = Document::invoice()->with('contact', 'items', 'items.taxes', 'item_taxes', 'last_history', 'transactions', 'totals', 'histories', 'media')->collect(['document_number'=> 'desc']);
 
         $total_invoices = Document::invoice()->count();
 
@@ -47,6 +47,20 @@ class Invoices extends Controller
      */
     public function show(Document $invoice)
     {
+        $invoice->load([
+            'items.taxes.tax',
+            'items.item',
+            'totals',
+            'contact',
+            'currency',
+            'category',
+            'histories',
+            'media',
+            'transactions',
+            'recurring',
+            'children',
+        ]);
+
         return view('sales.invoices.show', compact('invoice'));
     }
 

app/Http/Controllers/Sales/RecurringInvoices.php

@@ -13,6 +13,7 @@ use App\Jobs\Document\UpdateDocument;
 use App\Models\Common\Recurring;
 use App\Models\Document\Document;
 use App\Traits\Documents;
+use App\Utilities\Date;
 
 class RecurringInvoices extends Controller
 {
@@ -80,7 +81,11 @@ class RecurringInvoices extends Controller
      */
     public function store(Request $request)
     {
-        $response = $this->ajaxDispatch(new CreateDocument($request->merge(['issued_at' => $request->get('recurring_started_at')])));
+        $issue_at = Date::parse($request->get('recurring_started_at'))->format('Y-m-d');
+
+        $request->merge(['issued_at' => $issue_at]);
+
+        $response = $this->ajaxDispatch(new CreateDocument($request));
 
         if ($response['success']) {
             $response['redirect'] = route('recurring-invoices.show', $response['data']->id);
@@ -163,7 +168,11 @@ class RecurringInvoices extends Controller
      */
     public function update(Document $recurring_invoice, Request $request)
     {
-        $response = $this->ajaxDispatch(new UpdateDocument($recurring_invoice, $request->merge(['issued_at' => $request->get('recurring_started_at')])));
+        $issue_at = Date::parse($request->get('recurring_started_at'))->format('Y-m-d');
+
+        $request->merge(['issued_at' => $issue_at]);
+
+        $response = $this->ajaxDispatch(new UpdateDocument($recurring_invoice, $request));
 
         if ($response['success']) {
             $response['redirect'] = route('recurring-invoices.show', $response['data']->id);

app/Http/Controllers/Settings/Categories.php

@@ -24,17 +24,44 @@ class Categories extends Controller
      */
     public function index()
     {
+        $this->setActiveTabForCategories();
+
         $query = Category::with('sub_categories');
 
-        if (request()->has('search')) {
-            $query->withSubcategory();
+        if (search_string_value('searchable')) {
+            $query->withSubCategory();
         }
 
         $types = $this->getCategoryTypes();
 
-        $categories = $query->type(array_keys($types))->collect();
+        if (request()->get('list_records') == 'all') {
+            $query->type(array_keys($types));
+        }
 
-        return $this->response('settings.categories.index', compact('categories', 'types'));
+        $categories = $query->collect();
+
+        $tabs = $this->getCategoryTabs();
+
+        $tab = request()->get('list_records');
+        $tab_active = ! empty($tab) ? 'categories-' . $tab : 'categories-all';
+
+        $hide_code_column = true;
+
+        $search_string_type = search_string_value('type');
+        $selected_types = ! empty($search_string_type) ? explode(',', $search_string_type) : array_keys($types);
+
+        foreach (config('type.category', []) as $type => $config) {
+            if (! in_array($type, $selected_types)) {
+                continue;
+            }
+
+            if (empty($config['hide']) || !in_array('code', $config['hide'])) {
+                $hide_code_column = false;
+                break;
+            }
+        }
+
+        return $this->response('settings.categories.index', compact('categories', 'types', 'tabs', 'tab_active', 'hide_code_column'));
     }
 
     /**
@@ -54,14 +81,17 @@ class Categories extends Controller
      */
     public function create()
     {
-        $types = $this->getCategoryTypes();
-
         $categories = [];
 
         foreach (config('type.category') as $type => $config) {
             $categories[$type] = [];
         }
 
+        $type_group = $this->isGroupCategoryType();
+        $hide_code_types = $this->hideCodeCategoryTypes(array_keys($categories));
+
+        $types = $this->getCategoryTypes(group: $type_group);
+
         Category::enabled()->orderBy('name')->get()->each(function ($category) use (&$categories) {
             $categories[$category->type][] = [
                 'id' => $category->id,
@@ -70,7 +100,7 @@ class Categories extends Controller
             ];
         });
 
-        return view('settings.categories.create', compact('types', 'categories'));
+        return view('settings.categories.create', compact('types', 'categories', 'type_group', 'hide_code_types'));
     }
 
     /**
@@ -134,8 +164,6 @@ class Categories extends Controller
      */
     public function edit(Category $category)
     {
-        $types = $this->getCategoryTypes();
-
         $type_disabled = (Category::where('type', $category->type)->count() == 1) ?: false;
 
         $edited_category_id = $category->id;
@@ -146,6 +174,11 @@ class Categories extends Controller
             $categories[$type] = [];
         }
 
+        $type_group = $this->isGroupCategoryType();
+        $hide_code_types = $this->hideCodeCategoryTypes(array_keys($categories));
+
+        $types = $this->getCategoryTypes(group: $type_group);
+
         $skip_categories = [];
         $skip_categories[] = $edited_category_id;
 
@@ -175,7 +208,7 @@ class Categories extends Controller
 
         $parent_categories = $categories[$category->type] ?? [];
 
-        return view('settings.categories.edit', compact('category', 'types', 'type_disabled', 'categories', 'parent_categories'));
+        return view('settings.categories.edit', compact('category', 'types', 'type_disabled', 'categories', 'parent_categories', 'type_group', 'hide_code_types'));
     }
 
     /**

app/Http/Controllers/Settings/Defaults.php

@@ -6,9 +6,12 @@ use App\Abstracts\Http\SettingController;
 use App\Models\Banking\Account;
 use App\Models\Setting\Category;
 use App\Models\Setting\Tax;
+use App\Traits\Categories;
 
 class Defaults extends SettingController
 {
+    use Categories;
+
     public function edit()
     {
         $accounts = Account::enabled()->orderBy('name')->get()->pluck('title', 'id');
@@ -39,11 +42,16 @@ class Defaults extends SettingController
 
         $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
 
+        $income_category_types = $this->getIncomeCategoryTypes('string');
+        $expense_category_types = $this->getExpenseCategoryTypes('string');
+
         return view('settings.default.edit', compact(
             'accounts',
             'sales_categories',
             'purchases_categories',
             'taxes',
+            'income_category_types',
+            'expense_category_types',
         ));
     }
 }

app/Http/Kernel.php

@@ -84,6 +84,7 @@ class Kernel extends HttpKernel
             'menu.admin',
             'permission:read-admin-panel',
             'plan.limits',
+            'module.subscription',
         ],
 
         'wizard' => [
@@ -175,6 +176,7 @@ class Kernel extends HttpKernel
         'dropzone' => \App\Http\Middleware\Dropzone::class,
         'header.x' => \App\Http\Middleware\AddXHeader::class,
         'plan.limits' => \App\Http\Middleware\RedirectIfHitPlanLimits::class,
+        'module.subscription' => \App\Http\Middleware\RedirectIfHitModuleSubscription::class,
         'menu.admin' => \App\Http\Middleware\AdminMenu::class,
         'menu.portal' => \App\Http\Middleware\PortalMenu::class,
         'date.format' => \App\Http\Middleware\DateFormat::class,

app/Http/Middleware/RedirectIfHitModuleSubscription.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Traits\Modules;
+use App\Utilities\Versions;
+use Closure;
+
+class RedirectIfHitModuleSubscription
+{
+    use Modules;
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if (! $request->isMethod(strtolower('GET'))) {
+            return $next($request);
+        }
+
+        if ($request->ajax()) {
+            return $next($request);
+        }
+
+        if ($request->is(company_id() . '/apps/*')) {
+            return $next($request);
+        }
+
+        if (! $this->getModulesLimitOfSubscription()->action_status) {
+            return redirect()->route('dashboard');
+        }
+
+        return $next($request);
+    }
+}

app/Http/Requests/Common/ReportShow.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Http\Requests\Common;
+
+use App\Abstracts\Http\FormRequest;
+use Illuminate\Contracts\Validation\Validator;
+
+class ReportShow extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'start_date' => 'nullable|date',
+            'end_date' => 'nullable|date',
+        ];
+    }
+
+    public function failedValidation(Validator $validator)
+    {
+        // "If start_date and end_date is invalid, clear the values
+        if ($validator->errors()->has('start_date') && $validator->errors()->has('end_date')) {
+            request()->query->remove('start_date');
+            request()->query->remove('end_date');
+
+            return;
+        }
+
+        // If start_date is invalid, set it to be equal to end_date.
+        if ($validator->errors()->has('start_date')) {
+            request()->merge([
+                'start_date'   => request('end_date'),
+            ]);
+
+            return;
+        }
+
+        // If end_date is invalid, set it to be equal to start_date.
+        if ($validator->errors()->has('end_date')) {
+            request()->merge([
+                'end_date'   => request('start_date'),
+            ]);
+
+            return;
+        }
+    }
+}

app/Http/Requests/Setting/Category.php

@@ -15,8 +15,14 @@ class Category extends FormRequest
     {
         $types = collect(config('type.category'))->keys();
 
+        $type = $this->request->get('type');
+        $config = config('type.category.' . $type, []);
+        $code_hidden = !empty($config['hide']) && in_array('code', $config['hide']);
+        $code = $code_hidden ? 'nullable|string' : 'required|string';
+
         return [
             'name' => 'required|string',
+            'code' => $code,
             'type' => 'required|string|in:' . $types->implode(','),
             'color' => 'required|string|colour',
         ];

app/Http/Requests/Setting/Currency.php

@@ -29,8 +29,9 @@ class Currency extends FormRequest
             'rate' => 'required|gt:0',
             'enabled' => 'integer|boolean',
             'default_currency' => 'nullable|boolean',
+            'decimal_mark' => 'nullable|string|different:thousands_separator|regex:/^[A-Za-z.,_\s-]+$/',
             'symbol_first' => 'nullable|boolean',
-            'thousands_separator' => 'different:decimal_mark',
+            'thousands_separator' => 'nullable|different:decimal_mark|regex:/^[A-Za-z.,_\s-]+$/',
         ];
     }
 }

app/Http/Resources/Setting/Category.php

@@ -17,9 +17,11 @@ class Category extends JsonResource
         return [
             'id' => $this->id,
             'company_id' => $this->company_id,
+            'code' => $this->code,
             'name' => $this->name,
             'type' => $this->type,
             'color' => $this->color,
+            'description' => $this->description,
             'enabled' => $this->enabled,
             'parent_id' => $this->parent_id,
             'created_from' => $this->created_from,

app/Imports/Banking/Transactions.php

@@ -32,6 +32,10 @@ class Transactions extends Import
     {
         $row = parent::map($row);
 
+        if (!isset($row['type'])) {
+            return [];
+        }
+
         $real_type = $this->getRealTypeTransaction($row['type']);
         $contact_type = config('type.transaction.' . $real_type . '.contact_type', $real_type == 'income' ? 'customer' : 'vendor');
 
@@ -49,6 +53,7 @@ class Transactions extends Import
     public function prepareRules($rules): array
     {
         $rules['number'] = 'required|string';
+        $rules['type'] = 'required|string';
         //$rules['currency_rate'] = 'required|gt:0';
 
         return $rules;

app/Imports/Purchases/Bills/Sheets/BillTransactions.php

@@ -5,6 +5,7 @@ namespace App\Imports\Purchases\Bills\Sheets;
 use App\Abstracts\Import;
 use App\Http\Requests\Banking\Transaction as Request;
 use App\Models\Banking\Transaction as Model;
+use App\Models\Setting\Category;
 
 class BillTransactions extends Import
 {
@@ -36,9 +37,9 @@ class BillTransactions extends Import
 
         $row = parent::map($row);
 
-        $row['type'] = 'expense';
+        $row['type'] = Model::EXPENSE_TYPE;
         $row['account_id'] = $this->getAccountId($row);
-        $row['category_id'] = $this->getCategoryId($row, 'expense');
+        $row['category_id'] = $this->getCategoryId($row, Category::EXPENSE_TYPE);
         $row['contact_id'] = $this->getContactId($row, 'vendor');
         $row['currency_code'] = $this->getCurrencyCode($row);
         $row['document_id'] = $this->getDocumentId($row);

app/Imports/Sales/Invoices/Sheets/InvoiceTransactions.php

@@ -5,6 +5,7 @@ namespace App\Imports\Sales\Invoices\Sheets;
 use App\Abstracts\Import;
 use App\Http\Requests\Banking\Transaction as Request;
 use App\Models\Banking\Transaction as Model;
+use App\Models\Setting\Category;
 
 class InvoiceTransactions extends Import
 {
@@ -37,10 +38,10 @@ class InvoiceTransactions extends Import
 
         $row = parent::map($row);
 
-        $row['type'] = 'income';
+        $row['type'] = Model::INCOME_TYPE;
         $row['currency_code'] = $this->getCurrencyCode($row);
         $row['account_id'] = $this->getAccountId($row);
-        $row['category_id'] = $this->getCategoryId($row, 'income');
+        $row['category_id'] = $this->getCategoryId($row, Category::INCOME_TYPE);
         $row['contact_id'] = $this->getContactId($row, 'customer');
         $row['document_id'] = $this->getDocumentId($row);
         $row['number'] = $row['transaction_number'];

app/Imports/Settings/Categories.php

@@ -15,6 +15,8 @@ class Categories extends Import
     public $columns = [
         'name',
         'type',
+        'code',
+        'description',
     ];
 
     public function model(array $row)

app/Jobs/Auth/UpdateUser.php

@@ -34,7 +34,9 @@ class UpdateUser extends Job implements ShouldUpdate
                 $media = $this->getMedia($this->request->file('picture'), 'users');
 
                 $this->model->attachMedia($media, 'picture');
-            } elseif (! $this->request->file('picture') && $this->model->picture) {
+            } elseif ($this->request->isNotApi() && ! $this->request->file('picture') && $this->model->picture) {
+                $this->deleteMediaModel($this->model, 'picture', $this->request);
+            } elseif ($this->request->isApi() && $this->request->has('remove_picture') && $this->model->picture) {
                 $this->deleteMediaModel($this->model, 'picture', $this->request);
             }
 

app/Jobs/Banking/CreateBankingDocumentTransaction.php

@@ -38,13 +38,6 @@ class CreateBankingDocumentTransaction extends Job implements ShouldCreate
         \DB::transaction(function () {
             $this->transaction = $this->dispatch(new CreateTransaction($this->request));
 
-            // Upload attachment
-            if ($this->request->file('attachment')) {
-                $media = $this->getMedia($this->request->file('attachment'), 'transactions');
-
-                $this->transaction->attachMedia($media, 'attachment');
-            }
-
             $this->model->save();
 
             $this->createHistory();

app/Jobs/Banking/UpdateBankingDocumentTransaction.php

@@ -18,6 +18,8 @@ class UpdateBankingDocumentTransaction extends Job implements ShouldUpdate
 {
     use Currencies;
 
+    protected Transaction $transaction;
+
     public function __construct(Document $model, Transaction $transaction, $request)
     {
         $this->model = $model;
@@ -37,13 +39,6 @@ class UpdateBankingDocumentTransaction extends Job implements ShouldUpdate
         \DB::transaction(function () {
             $this->transaction = $this->dispatch(new UpdateTransaction($this->transaction, $this->request));
 
-            // Upload attachment
-            if ($this->request->file('attachment')) {
-                $media = $this->getMedia($this->request->file('attachment'), 'transactions');
-
-                $this->transaction->attachMedia($media, 'attachment');
-            }
-
             $this->model->save();
 
             $this->createHistory();

app/Jobs/Banking/UpdateTransaction.php

@@ -35,7 +35,9 @@ class UpdateTransaction extends Job implements ShouldUpdate
 
                     $this->model->attachMedia($media, 'attachment');
                 }
-            } elseif (! $this->request->file('attachment') && $this->model->attachment) {
+            } elseif ($this->request->isNotApi() && ! $this->request->file('attachment') && $this->model->attachment) {
+                $this->deleteMediaModel($this->model, 'attachment', $this->request);
+            } elseif ($this->request->isApi() && $this->request->has('remove_attachment') && $this->model->attachment) {
                 $this->deleteMediaModel($this->model, 'attachment', $this->request);
             }
 

app/Jobs/Banking/UpdateTransfer.php

@@ -26,7 +26,9 @@ class UpdateTransfer extends Job implements ShouldUpdate
 
                     $this->model->attachMedia($media, 'attachment');
                 }
-            } elseif (! $this->request->file('attachment') && $this->model->attachment) {
+            } elseif ($this->request->isNotApi() && ! $this->request->file('attachment') && $this->model->attachment) {
+                $this->deleteMediaModel($this->model, 'attachment', $this->request);
+            } elseif ($this->request->isApi() && $this->request->has('remove_attachment') && $this->model->attachment) {
                 $this->deleteMediaModel($this->model, 'attachment', $this->request);
             }
 

app/Jobs/Common/CreateMediableForDownload.php

@@ -60,7 +60,7 @@ class CreateMediableForDownload extends JobShouldQueue
 
     public function getQueuedMedia()
     {
-        return config('excel.temporary_files.remote_disk') !== null
+        return config('dompdf.disk') !== null
                 ? $this->getRemoteQueuedMedia()
                 : $this->getLocalQueuedMedia();
     }
@@ -88,12 +88,15 @@ class CreateMediableForDownload extends JobShouldQueue
 
     public function getRemoteQueuedMedia()
     {
-        $disk = config('excel.temporary_files.remote_disk');
-        $prefix = config('excel.temporary_files.remote_prefix');
+        $disk = config('dompdf.disk');
 
-        $content = Storage::disk($disk)->get($this->file_name);
+        $folder_path = 'app/temp/' . company_id() . '/bulk_actions/';
 
-        $file_name = str_replace([$prefix, '.xlsx', '.xls'], '', $this->file_name);
+        $source = get_storage_path($folder_path . $this->file_name . '.zip');
+
+        $content = Storage::disk($disk)->get($source);
+
+        $file_name = str_replace(['.pdf', '.zip'], '', $this->file_name);
 
         $destination = $this->getMediaFolder('bulk_actions');
 
@@ -106,7 +109,7 @@ class CreateMediableForDownload extends JobShouldQueue
                         ->toDirectory($destination)
                         ->upload();
 
-        Storage::disk($disk)->delete($this->file_name);
+        Storage::disk($disk)->delete($source);
 
         return $media;
     }

app/Jobs/Common/CreateZipForDownload.php

@@ -4,6 +4,7 @@ namespace App\Jobs\Common;
 
 use App\Abstracts\JobShouldQueue;
 use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Storage;
 use ZipArchive;
 
 class CreateZipForDownload extends JobShouldQueue
@@ -34,27 +35,76 @@ class CreateZipForDownload extends JobShouldQueue
     {
         $zip_archive = new ZipArchive();
 
-        $folder_path = 'app/temp/' . company_id() . '/bulk_actions/';
+        $folder_path = 'app' . DIRECTORY_SEPARATOR . 'temp' . DIRECTORY_SEPARATOR . company_id() . DIRECTORY_SEPARATOR . 'bulk_actions' . DIRECTORY_SEPARATOR;
 
+        File::ensureDirectoryExists(storage_path($folder_path));
         File::ensureDirectoryExists(get_storage_path($folder_path));
 
-        $zip_path = get_storage_path($folder_path . $this->file_name . '.zip');
+        $zip_path = storage_path($folder_path . $this->file_name . '.zip');
 
         $zip_archive->open($zip_path, ZipArchive::CREATE | ZipArchive::OVERWRITE);
-
-        $total = count($this->selected);
-        $current = 0;
     
         foreach ($this->selected as $selected) {
-            $current++;
-    
-            if ($current === $total) {
-                $this->dispatch(new $this->class($selected, $folder_path, $zip_archive, true));
-            } else {
-                $this->dispatch(new $this->class($selected, $folder_path, $zip_archive));
-            }
+            $pdf_path = $this->dispatch(new $this->class($selected, $folder_path));
+
+            $fileContent = $this->getQueuedFile($pdf_path);
+            
+            $zip_archive->addFromString(basename($pdf_path), $fileContent);
+
+            /*
+            Storage::disk('local')->put($folder_path . basename($pdf_path), $fileContent);
+
+            $zip->addFile(storage_path($folder_path . basename($pdf_path)), basename($pdf_path));
+            */
         }
 
+        $zip_archive->close();
+
+        $this->copyQueuedFile($folder_path, $zip_path);
+
         return $zip_path;
     }
+
+    public function getQueuedFile($pdf_path)
+    {
+        return config('dompdf.disk') !== null
+                ? $this->getRemoteQueuedMedia($pdf_path)
+                : $this->getLocalQueuedMedia($pdf_path);
+    }
+
+    public function getLocalQueuedMedia($pdf_path)
+    {
+        $content = File::get($pdf_path);
+
+        return $content;
+    }
+
+    public function getRemoteQueuedMedia($pdf_path)
+    {
+        $disk = config('dompdf.disk');
+
+        $content = Storage::disk($disk)->get($pdf_path);
+
+        return $content;
+    }
+
+    public function copyQueuedFile($folder_path, $zip_path)
+    {
+        return config('dompdf.disk') !== null
+                ? $this->copyRemoteQueuedMedia($folder_path, $zip_path)
+                : true;
+    }
+
+    public function copyRemoteQueuedMedia($folder_path, $zip_path)
+    {
+        $disk = config('dompdf.disk');
+
+        $file_path = get_storage_path($folder_path . basename($zip_path));
+
+        $content = Storage::disk($disk)->put($file_path, fopen($zip_path, 'r+'));
+
+        report($file_path);
+
+        return $content;
+    }
 }

app/Jobs/Common/UpdateContact.php

@@ -28,10 +28,14 @@ class UpdateContact extends Job implements ShouldUpdate
 
             // Upload logo
             if ($this->request->file('logo')) {
+                $this->deleteMediaModel($this->model, 'logo', $this->request);
+
                 $media = $this->getMedia($this->request->file('logo'), Str::plural($this->model->type));
 
                 $this->model->attachMedia($media, 'logo');
-            } elseif (! $this->request->file('logo') && $this->model->logo) {
+            } elseif ($this->request->isNotApi() && ! $this->request->file('logo') && $this->model->logo) {
+                $this->deleteMediaModel($this->model, 'logo', $this->request);
+            } elseif ($this->request->isApi() && $this->request->has('remove_logo') && $this->model->logo) {
                 $this->deleteMediaModel($this->model, 'logo', $this->request);
             }
 

app/Jobs/Common/UpdateItem.php

@@ -20,9 +20,15 @@ class UpdateItem extends Job implements ShouldUpdate
 
             // Upload picture
             if ($this->request->file('picture')) {
+                $this->deleteMediaModel($this->model, 'picture', $this->request);
+
                 $media = $this->getMedia($this->request->file('picture'), 'items');
 
                 $this->model->attachMedia($media, 'picture');
+            } elseif ($this->request->isNotApi() && ! $this->request->file('picture') && $this->model->picture) {
+                $this->deleteMediaModel($this->model, 'picture', $this->request);
+            } elseif ($this->request->isApi() && $this->request->has('remove_picture') && $this->model->picture) {
+                $this->deleteMediaModel($this->model, 'picture', $this->request);
             }
 
             $this->deleteRelationships($this->model, ['taxes']);

app/Jobs/Document/CreateDocumentItem.php

@@ -47,10 +47,12 @@ class CreateDocumentItem extends Job implements HasOwner, HasSource, ShouldCreat
         // Apply total discount to amount
         if (! empty($this->request['global_discount'])) {
             if ($this->request['global_discount_type'] === 'percentage') {
-                $item_discounted_amount -= $item_discounted_amount * ($this->request['global_discount'] / 100);
+                $global_discount = $item_discounted_amount * ($this->request['global_discount'] / 100);
             } else {
-                $item_discounted_amount -= $this->request['global_discount'];
+                $global_discount = $this->request['global_discount'];
             }
+
+            $item_discounted_amount -= $global_discount;
         }
 
         $tax_amount = 0;
@@ -153,6 +155,12 @@ class CreateDocumentItem extends Job implements HasOwner, HasSource, ShouldCreat
             }
         }
 
+        if (! empty($global_discount)) {
+            $actual_price_item += $global_discount;
+            $item_amount += $global_discount; 
+            $item_discounted_amount += $global_discount;
+        }
+
         $this->request['company_id'] = $this->document->company_id;
         $this->request['type'] = $this->document->type;
         $this->request['document_id'] = $this->document->id;

app/Jobs/Document/CreateDocumentItemsAndTotals.php

@@ -70,7 +70,8 @@ class CreateDocumentItemsAndTotals extends Job implements HasOwner, HasSource, S
 
         if (! empty($this->request['discount'])) {
             if ($this->request['discount_type'] === 'percentage') {
-                $discount_total = ($sub_total - $discount_amount_total) * ($this->request['discount'] / 100);
+                //$discount_total = ($sub_total - $discount_amount_total) * ($this->request['discount'] / 100);
+                $discount_total = $sub_total * ($this->request['discount'] / 100);
             } else {
                 $discount_total = $this->request['discount'];
             }
@@ -173,17 +174,16 @@ class CreateDocumentItemsAndTotals extends Job implements HasOwner, HasSource, S
         foreach ((array) $this->request['items'] as $key => $item) {
             $item['global_discount'] = 0;
 
-            /* // Disable this lines for global discount issue fixed ( https://github.com/akaunting/akaunting/issues/2797 )
+            // Disable this lines for global discount issue fixed ( https://github.com/akaunting/akaunting/issues/2797 )
             if (! empty($this->request['discount'])) {
                 if (isset($for_fixed_discount)) {
                     $item['global_discount'] = ($for_fixed_discount[$key] / ($for_fixed_discount['total'] / 100)) * ($this->request['discount'] / 100);
-                    $item['global_discount_type'] = '';
+                    $item['global_discount_type'] = $this->request['discount_type'];
                 } else {
                     $item['global_discount'] = $this->request['discount'];
                     $item['global_discount_type'] = $this->request['discount_type'];
                 }
             }
-            */
 
             $item['created_from'] = $this->request['created_from'];
             $item['created_by'] = $this->request['created_by'];
@@ -211,7 +211,9 @@ class CreateDocumentItemsAndTotals extends Job implements HasOwner, HasSource, S
 
             $document_item = $this->dispatch(new CreateDocumentItem($this->document, $item));
 
-            $item_amount = (double) $item['price'] * (double) $item['quantity'];
+            # This line changed for discount calcualter issue
+            //$item_amount = (double) $item['price'] * (double) $item['quantity'];
+            $item_amount = $document_item->total;
 
             $discount_amount = 0;
 
@@ -236,11 +238,11 @@ class CreateDocumentItemsAndTotals extends Job implements HasOwner, HasSource, S
             // Set taxes
             foreach ((array) $document_item->item_taxes as $item_tax) {
                 if (array_key_exists($item_tax['tax_id'], $taxes)) {
-                    $taxes[$item_tax['tax_id']]['amount'] += $item_tax['amount'];
+                    $taxes[$item_tax['tax_id']]['amount'] += round((float) $item_tax['amount'], $this->document->currency->precision);
                 } else {
                     $taxes[$item_tax['tax_id']] = [
                         'name' => $item_tax['name'],
-                        'amount' => $item_tax['amount'],
+                        'amount' => round((float) $item_tax['amount'], $this->document->currency->precision),
                     ];
                 }
             }

app/Jobs/Document/DownloadDocument.php

@@ -49,28 +49,20 @@ class DownloadDocument extends Job
 
         switch ($this->method) {
             case 'download':
-                return $pdf->download($file_name);
+                $response = $pdf->download($file_name);
 
                 break;
             default:
-                if (empty($this->zip_archive)) {
-                    return;
-                }
-
                 $pdf_path = get_storage_path($this->folder_path . $file_name);
 
                 // Save the PDF file into temp folder
                 $pdf->save($pdf_path);
 
-                $this->zip_archive->addFile($pdf_path, $file_name);
-
-                if ($this->close_zip) {
-                    $this->zip_archive->close();
-                }
-
-                return;
+                $response = $pdf_path;
 
                 break;
         }
+
+        return $response;
     }
 }

app/Jobs/Document/UpdateDocument.php

@@ -18,18 +18,21 @@ class UpdateDocument extends Job implements ShouldUpdate
 
     public function handle(): Document
     {
+        $this->authorize();
+
         if (empty($this->request['amount'])) {
             $this->request['amount'] = 0;
         }
 
         // Disable this lines for global discount issue fixed ( https://github.com/akaunting/akaunting/issues/2797 )
-        if (! empty($this->request['discount'])) {
-            $this->request['discount_rate'] = $this->request['discount'];
-        }
+        $this->request['discount_rate'] = $this->request['discount'] ?? null;
 
         event(new DocumentUpdating($this->model, $this->request));
 
-        \DB::transaction(function () {
+        // Track original contact_id to sync transactions if it changes
+        $originalContactId = $this->model->contact_id;
+
+        \DB::transaction(function () use ($originalContactId) {
             // Upload attachment
             if ($this->request->file('attachment')) {
                 $this->deleteMediaModel($this->model, 'attachment', $this->request);
@@ -39,7 +42,9 @@ class UpdateDocument extends Job implements ShouldUpdate
 
                     $this->model->attachMedia($media, 'attachment');
                 }
-            } elseif (! $this->request->file('attachment') && $this->model->attachment) {
+            } elseif ($this->request->isNotApi() && ! $this->request->file('attachment') && $this->model->attachment) {
+                $this->deleteMediaModel($this->model, 'attachment', $this->request);
+            } elseif ($this->request->isApi() && $this->request->has('remove_attachment') && $this->model->attachment) {
                 $this->deleteMediaModel($this->model, 'attachment', $this->request);
             }
 
@@ -66,6 +71,13 @@ class UpdateDocument extends Job implements ShouldUpdate
 
             $this->model->update($this->request->all());
 
+            // Sync transaction contact_id if document contact changed
+            if (isset($this->request['contact_id']) && $originalContactId != $this->request['contact_id']) {
+                $this->model->transactions()->update([
+                    'contact_id' => $this->request['contact_id'],
+                ]);
+            }
+
             $this->model->updateRecurring($this->request->all());
         });
 
@@ -73,4 +85,23 @@ class UpdateDocument extends Job implements ShouldUpdate
 
         return $this->model;
     }
+
+    /**
+     * Determine if this action is applicable.
+     */
+    public function authorize(): void
+    {
+        $lockedStatuses = ['sent', 'received', 'viewed', 'partial', 'paid', 'overdue', 'unpaid', 'cancelled'];
+
+        if (
+            isset($this->request['contact_id']) &&
+            (int) $this->request['contact_id'] !== (int) $this->model->contact_id &&
+            in_array($this->model->status, $lockedStatuses)
+        ) {
+            $type = Str::plural($this->model->type);
+            $message = trans('messages.warning.contact_change', ['type' => trans_choice("general.$type", 1)]);
+
+            throw new \Exception($message);
+        }
+    }
 }

app/Listeners/Report/AddCustomers.php

@@ -13,6 +13,7 @@ class AddCustomers extends Listener
     protected $classes = [
         'App\Reports\IncomeSummary',
         'App\Reports\IncomeExpenseSummary',
+        'App\Reports\DiscountSummary',
     ];
 
     /**

app/Listeners/Report/AddDate.php

@@ -14,6 +14,7 @@ class AddDate extends Listener
         'App\Reports\IncomeExpenseSummary',
         'App\Reports\ProfitLoss',
         'App\Reports\TaxSummary',
+        'App\Reports\DiscountSummary',
     ];
 
     /**

app/Listeners/Report/AddDiscount.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Listeners\Report;
+
+use App\Abstracts\Listeners\Report as Listener;
+use App\Events\Report\FilterApplying;
+use App\Events\Report\FilterShowing;
+
+class AddDiscount extends Listener
+{
+    protected $classes = [
+        'App\Reports\DiscountSummary',
+    ];
+
+    /**
+     * Handle filter showing event.
+     *
+     * @param  $event
+     * @return void
+     */
+    public function handleFilterShowing(FilterShowing $event)
+    {
+        if ($this->skipThisClass($event)) {
+            return;
+        }
+
+        $event->class->filters['discounts'] = $this->getDiscount();
+        $event->class->filters['keys']['discounts'] = 'discount';
+        $event->class->filters['defaults']['discounts'] = 'both';
+        $event->class->filters['operators']['discounts'] = [
+            'equal'     => true,
+            'not_equal' => false,
+            'range'     => false,
+        ];
+    }
+
+    /**
+     * Handle filter applying event.
+     *
+     * @param  $event
+     * @return void
+     */
+    public function handleFilterApplying(FilterApplying $event)
+    {
+        if ($this->skipThisClass($event)) {
+            return;
+        }
+        
+        // Apply discount filter
+        $this->applyDiscountFilter($event);
+    }
+}

app/Listeners/Report/AddExpenseCategories.php

@@ -26,8 +26,8 @@ class AddExpenseCategories extends Listener
         }
 
         // send true for add limit on search and filter..
-        $event->class->filters['categories'] = $this->getExpenseCategories(true);
-        $event->class->filters['routes']['categories'] = ['categories.index', 'search=type:expense enabled:1'];
+        $event->class->filters['categories'] = $this->getExpenseCategories();
+        $event->class->filters['routes']['categories'] = ['categories.index', 'search=type:' . $this->getExpenseCategoryTypes('string') . ' enabled:1'];
         $event->class->filters['multiple']['categories'] = true;
     }
 

app/Listeners/Report/AddIncomeCategories.php

@@ -26,8 +26,8 @@ class AddIncomeCategories extends Listener
         }
 
         // send true for add limit on search and filter..
-        $event->class->filters['categories'] = $this->getIncomeCategories(true);
-        $event->class->filters['routes']['categories'] = ['categories.index', 'search=type:income enabled:1'];
+        $event->class->filters['categories'] = $this->getIncomeCategories();
+        $event->class->filters['routes']['categories'] = ['categories.index', 'search=type:' . $this->getIncomeCategoryTypes('string') . ' enabled:1'];
         $event->class->filters['multiple']['categories'] = true;
     }
 

app/Listeners/Report/AddIncomeExpenseCategories.php

@@ -20,14 +20,17 @@ class AddIncomeExpenseCategories extends Listener
     {
         $classes = [
             'App\Reports\IncomeExpenseSummary',
+            'App\Reports\DiscountSummary',
         ];
 
         if (empty($event->class) || !in_array(get_class($event->class), $classes)) {
             return;
         }
 
-        $event->class->filters['categories'] = $this->getIncomeExpenseCategories(true);
-        $event->class->filters['routes']['categories'] = ['categories.index', 'search=type:income,expense enabled:1'];
+        $types = array_merge($this->getIncomeCategoryTypes(), $this->getExpenseCategoryTypes());
+
+        $event->class->filters['categories'] = $this->getIncomeExpenseCategories();
+        $event->class->filters['routes']['categories'] = ['categories.index', 'search=type:' . implode(',', $types) . ' enabled:1'];
         $event->class->filters['multiple']['categories'] = true;
     }
 
@@ -42,6 +45,7 @@ class AddIncomeExpenseCategories extends Listener
         $classes = [
             'App\Reports\IncomeExpenseSummary',
             'App\Reports\ProfitLoss',
+            'App\Reports\DiscountSummary',
         ];
 
         if (empty($event->class) || !in_array(get_class($event->class), $classes)) {
@@ -67,7 +71,7 @@ class AddIncomeExpenseCategories extends Listener
             return;
         }
 
-        $categories = Category::type(['income', 'expense'])->orderBy('name')->get();
+        $categories = Category::type(array_merge($this->getIncomeCategoryTypes(), $this->getExpenseCategoryTypes()))->orderBy('name')->get();
         $rows = $categories->pluck('name', 'id')->toArray();
 
         $this->setRowNamesAndValuesForCategories($event, $rows, $categories);
@@ -81,10 +85,12 @@ class AddIncomeExpenseCategories extends Listener
     {
         foreach ($event->class->dates as $date) {
             foreach ($event->class->tables as $table_key => $table_name) {
+                $table_keys = $table_key == Category::INCOME_TYPE ? $this->getIncomeCategoryTypes() : $this->getExpenseCategoryTypes();
+
                 foreach ($rows as $id => $name) {
                     $category = $categories->where('id', $id)->first();
 
-                    if ($category->type != $table_key) {
+                    if (!in_array($category->type, $table_keys)) {
                         continue;
                     }
 
@@ -98,10 +104,12 @@ class AddIncomeExpenseCategories extends Listener
     public function setTreeNodesForCategories($event, $nodes, $categories)
     {
         foreach ($event->class->tables as $table_key => $table_name) {
+            $table_keys = $table_key == Category::INCOME_TYPE ? $this->getIncomeCategoryTypes() : $this->getExpenseCategoryTypes();
+
             foreach ($nodes as $id => $node) {
                 $category = $categories->where('id', $id)->first();
 
-                if ($category->type != $table_key) {
+                if (!in_array($category->type, $table_keys)) {
                     continue;
                 }
 

app/Listeners/Report/AddPeriod.php

@@ -13,6 +13,7 @@ class AddPeriod extends Listener
         'App\Reports\IncomeExpenseSummary',
         'App\Reports\ProfitLoss',
         'App\Reports\TaxSummary',
+        'App\Reports\DiscountSummary',
     ];
 
     /**

app/Listeners/Report/AddSearchString.php

@@ -13,6 +13,7 @@ class AddSearchString extends Listener
         'App\Reports\IncomeExpenseSummary',
         'App\Reports\ProfitLoss',
         'App\Reports\TaxSummary',
+        'App\Reports\DiscountSummary',
     ];
 
     /**
@@ -27,8 +28,8 @@ class AddSearchString extends Listener
             return;
         }
 
-        $old = old();
-        $request = request()->all();
+        $old = old() ?? [];
+        $request = request()->all() ?? [];
 
         if ($old || $request) {
             $input = request('search');

app/Listeners/Report/AddVendors.php

@@ -13,6 +13,7 @@ class AddVendors extends Listener
     protected $classes = [
         'App\Reports\ExpenseSummary',
         'App\Reports\IncomeExpenseSummary',
+        'App\Reports\DiscountSummary',
     ];
 
     /**

app/Listeners/Update/V31/Version3119.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Listeners\Update\V31;
+
+use App\Abstracts\Listeners\Update as Listener;
+use App\Events\Install\UpdateFinished as Event;
+use App\Traits\Permissions;
+use Illuminate\Support\Facades\Log;
+
+class Version3119 extends Listener
+{
+    use Permissions;
+
+    const ALIAS = 'core';
+
+    const VERSION = '3.1.19';
+
+    /**
+     * Handle the event.
+     *
+     * @param  $event
+     * @return void
+     */
+    public function handle(Event $event)
+    {
+        if ($this->skipThisUpdate($event)) {
+            return;
+        }
+
+        Log::channel('stdout')->info('Updating to 3.1.19 version...');
+
+        $this->updatePermissions();
+
+        Log::channel('stdout')->info('Done!');
+    }
+
+    /**
+     * Update permissions.
+     *
+     * @return void
+     */
+    public function updatePermissions()
+    {
+        $rows = [
+            'admin' => [
+                'reports-discount-summary' => 'r'
+            ],
+            'manager' => [
+                'reports-discount-summary' => 'r'
+            ],
+            'accountant' => [
+                'reports-discount-summary' => 'r'
+            ],
+        ];
+
+        $this->attachPermissionsByRoleNames($rows);
+    }
+}

app/Models/Banking/TransactionTax.php

@@ -5,12 +5,13 @@ namespace App\Models\Banking;
 use App\Abstracts\Model;
 use App\Models\Banking\Transaction;
 use App\Traits\Currencies;
+use App\Traits\Transactions;
 use Bkwld\Cloner\Cloneable;
 use Illuminate\Database\Eloquent\Builder;
 
 class TransactionTax extends Model
 {
-    use Cloneable, Currencies;
+    use Cloneable, Currencies, Transactions;
 
     protected $table = 'transaction_taxes';
 
@@ -31,34 +32,92 @@ class TransactionTax extends Model
         return $this->belongsTo('App\Models\Banking\Transaction')->withDefault(['name' => trans('general.na')]);
     }
 
-    public function scopeType(Builder $query, string $type)
+    public function scopeType(Builder $query, $types): Builder
     {
-        return $query->where($this->qualifyColumn('type'), '=', $type);
+        if (empty($types)) {
+            return $query;
+        }
+
+        return $query->whereIn($this->qualifyColumn('type'), (array) $types);
     }
 
     public function scopeIncome(Builder $query)
     {
-        return $query->where($this->qualifyColumn('type'), '=', Transaction::INCOME_TYPE);
+        return $query->whereIn($this->qualifyColumn('type'), (array) $this->getIncomeTypes());
+    }
+
+    public function scopeIncomeTransfer(Builder $query): Builder
+    {
+        return $query->where($this->qualifyColumn('type'), '=', Transaction::INCOME_TRANSFER_TYPE);
     }
 
     public function scopeIncomeRecurring(Builder $query): Builder
     {
         return $query->where($this->qualifyColumn('type'), '=', Transaction::INCOME_RECURRING_TYPE)
-                    ->whereHas('document.recurring', function (Builder $query) {
-                        $query->whereNull('deleted_at');
-                    });
+                ->whereHas('transaction.recurring', function (Builder $query) {
+                    $query->whereNull('deleted_at');
+                });
     }
 
     public function scopeExpense(Builder $query)
     {
-        return $query->where($this->qualifyColumn('type'), '=', Transaction::EXPENSE_TYPE);
+        return $query->whereIn($this->qualifyColumn('type'), (array) $this->getExpenseTypes());
+    }
+
+    public function scopeExpenseTransfer(Builder $query): Builder
+    {
+        return $query->where($this->qualifyColumn('type'), '=', Transaction::EXPENSE_TRANSFER_TYPE);
     }
 
     public function scopeExpenseRecurring(Builder $query): Builder
     {
         return $query->where($this->qualifyColumn('type'), '=', Transaction::EXPENSE_RECURRING_TYPE)
-                    ->whereHas('document.recurring', function (Builder $query) {
-                        $query->whereNull('deleted_at');
-                    });
+                ->whereHas('transaction.recurring', function (Builder $query) {
+                    $query->whereNull('deleted_at');
+                });
+    }
+
+    public function scopeIsTransfer(Builder $query): Builder
+    {
+        return $query->where($this->qualifyColumn('type'), 'like', '%-transfer');
+    }
+
+    public function scopeIsNotTransfer(Builder $query): Builder
+    {
+        return $query->where($this->qualifyColumn('type'), 'not like', '%-transfer');
+    }
+
+    public function scopeIsRecurring(Builder $query): Builder
+    {
+        return $query->where($this->qualifyColumn('type'), 'like', '%-recurring');
+    }
+
+    public function scopeIsNotRecurring(Builder $query): Builder
+    {
+        return $query->where($this->qualifyColumn('type'), 'not like', '%-recurring');
+    }
+
+    public function scopeIsSplit(Builder $query): Builder
+    {
+        return $query->where($this->qualifyColumn('type'), 'like', '%-split');
+    }
+
+    public function scopeIsNotSplit(Builder $query): Builder
+    {
+        return $query->where($this->qualifyColumn('type'), 'not like', '%-split');
+    }
+
+    public function scopeIsDocument(Builder $query): Builder
+    {
+        return $query->whereHas('transaction', function ($q) {
+                    $q->whereNotNull('document_id');
+                });
+    }
+
+    public function scopeIsNotDocument(Builder $query): Builder
+    {
+        return $query->whereHas('transaction', function ($q) {
+                    $q->whereNull('document_id');
+                });
     }
 }

app/Models/Common/Company.php

@@ -616,9 +616,10 @@ class Company extends Eloquent implements Ownable
         setting()->forgetAll();
         setting()->load(true);
 
-        // Override settings and currencies
+        // Override settings, currencies, and category types
         Overrider::load('settings');
         Overrider::load('currencies');
+        Overrider::load('categoryTypes');
 
         event(new CompanyMadeCurrent($this));
 

app/Models/Common/Contact.php

@@ -303,7 +303,11 @@ class Contact extends Model
     {
         if (! empty($this->email)) {
             return true;
-        } 
+        }
+
+        if (isset($this->contact_persons_with_email_count)) {
+            return $this->contact_persons_with_email_count > 0;
+        }
 
         if ($this->contact_persons()->whereNotNull('email')->count()) {
             return true;

app/Models/Common/Report.php

@@ -5,6 +5,7 @@ namespace App\Models\Common;
 use App\Abstracts\Model;
 use Bkwld\Cloner\Cloneable;
 use Illuminate\Support\Str;
+use Illuminate\Database\Eloquent\Builder;
 
 class Report extends Model
 {
@@ -43,6 +44,43 @@ class Report extends Model
         return $query->where('class', 'like', $class . '%');
     }
 
+    /**
+     * Scope to only include reports of a given class.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param string $class
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeClass($query, $class)
+    {
+        return $query->where('class', '=', $class);
+    }
+
+    public function scopeExpenseSummary(Builder $query): Builder
+    {
+        return $query->where($this->qualifyColumn('class'), '=', 'App\\Reports\\ExpenseSummary');
+    }
+
+    public function scopeIncomeSummary(Builder $query): Builder
+    {
+        return $query->where($this->qualifyColumn('class'), '=', 'App\\Reports\\IncomeSummary');
+    }
+
+    public function scopeIncomeExpenseSummary(Builder $query): Builder
+    {
+        return $query->where($this->qualifyColumn('class'), '=', 'App\\Reports\\IncomeExpenseSummary');
+    }
+
+    public function scopeProfitLoss(Builder $query): Builder
+    {
+        return $query->where($this->qualifyColumn('class'), '=', 'App\\Reports\\ProfitLoss');
+    }
+
+    public function scopeTaxSummary(Builder $query): Builder
+    {
+        return $query->where($this->qualifyColumn('class'), '=', 'App\\Reports\\TaxSummary');
+    }
+
     /**
      * Get the alias based on class.
      *

app/Models/Document/Document.php

@@ -132,7 +132,7 @@ class Document extends Model
 
     public function items()
     {
-        return $this->hasMany('App\Models\Document\DocumentItem', 'document_id');
+        return $this->hasMany('App\Models\Document\DocumentItem', 'document_id')->with('taxes');
     }
 
     public function item_taxes()
@@ -274,14 +274,22 @@ class Document extends Model
 
     public function getSentAtAttribute(string $value = null)
     {
-        $sent = $this->histories()->where('document_histories.status', 'sent')->first();
+        if ($this->relationLoaded('histories')) {
+            $sent = $this->histories->where('status', 'sent')->first();
+        } else {
+            $sent = $this->histories()->where('document_histories.status', 'sent')->first();
+        }
 
         return $sent->created_at ?? null;
     }
 
     public function getReceivedAtAttribute(string $value = null)
     {
-        $received = $this->histories()->where('document_histories.status', 'received')->first();
+        if ($this->relationLoaded('histories')) {
+            $received = $this->histories->where('status', 'received')->first();
+        } else {
+            $received = $this->histories()->where('document_histories.status', 'received')->first();
+        }
 
         return $received->created_at ?? null;
     }
@@ -347,7 +355,11 @@ class Document extends Model
         if ($discount) {
             $sub_total = $this->totals->where('code', 'sub_total')->makeHidden('title')->pluck('amount')->first();
 
-            $percent = number_format((($discount * 100) / $sub_total), 0);
+            if ($sub_total && $sub_total > 0) {
+                $percent = number_format((($discount * 100) / $sub_total), 0);
+            } else {
+                $percent = 0;
+            }
         }
 
         return $percent;
@@ -374,6 +386,11 @@ class Document extends Model
         $rate = $this->currency_rate;
         $precision = currency($code)->getPrecision();
 
+        // Lazy eager load transactions if not already loaded to prevent N+1 queries
+        if (!$this->relationLoaded('transactions')) {
+            $this->load('transactions');
+        }
+
         if ($this->transactions->count()) {
             foreach ($this->transactions as $transaction) {
                 $amount = $transaction->amount;
@@ -406,6 +423,11 @@ class Document extends Model
         $rate = $this->currency_rate;
         $precision = currency($code)->getPrecision();
 
+        // Lazy eager load transactions if not already loaded to prevent N+1 queries
+        if (!$this->relationLoaded('transactions')) {
+            $this->load('transactions');
+        }
+
         if ($this->transactions->count()) {
             foreach ($this->transactions as $transaction) {
                 $amount = $transaction->amount;
@@ -415,7 +437,7 @@ class Document extends Model
                 }
 
                 if ($transaction->reconciled) {
-                    $reconciled_amount = +$amount;
+                    $reconciled_amount += $amount;
                 }
             }
         }

app/Models/Document/DocumentItem.php

@@ -50,6 +50,7 @@ class DocumentItem extends Model
         'price'         => 'double',
         'total'         => 'double',
         'tax'           => 'double',
+        'discount_rate' => 'double',
         'deleted_at'    => 'datetime',
     ];
 
@@ -132,7 +133,7 @@ class DocumentItem extends Model
         return $text;
     }
 
-    public function getDiscountRateAttribute(int $value = 0)
+    public function getDiscountRateAttribute($value = 0)
     {
         $discount_rate = 0;
 

app/Models/Setting/Category.php

@@ -4,11 +4,13 @@ namespace App\Models\Setting;
 
 use App\Abstracts\Model;
 use App\Builders\Category as Builder;
+use App\Models\Banking\Transaction;
 use App\Models\Document\Document;
 use App\Interfaces\Export\WithParentSheet;
 use App\Relations\HasMany\Category as HasMany;
 use App\Scopes\Category as Scope;
 use App\Traits\Categories;
+use App\Traits\DateTime;
 use App\Traits\Tailwind;
 use App\Traits\Transactions;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
@@ -17,7 +19,7 @@ use Illuminate\Database\Eloquent\Model as EloquentModel;
 
 class Category extends Model
 {
-    use Categories, HasFactory, Tailwind, Transactions;
+    use Categories, HasFactory, Tailwind, Transactions, DateTime;
 
     public const INCOME_TYPE = 'income';
     public const EXPENSE_TYPE = 'expense';
@@ -33,14 +35,14 @@ class Category extends Model
      *
      * @var array
      */
-    protected $fillable = ['company_id', 'name', 'type', 'color', 'enabled', 'created_from', 'created_by', 'parent_id'];
+    protected $fillable = ['company_id', 'code', 'name', 'type', 'color', 'description', 'enabled', 'created_from', 'created_by', 'parent_id'];
 
     /**
      * Sortable columns.
      *
      * @var array
      */
-    public $sortable = ['name', 'type', 'enabled'];
+    public $sortable = ['code', 'name', 'type', 'enabled'];
 
     /**
      * The "booted" method of the model.
@@ -137,6 +139,18 @@ class Category extends Model
         return $this->hasMany('App\Models\Banking\Transaction');
     }
 
+    /**
+     * Scope code.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param $code
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeCode($query, $code)
+    {
+        return $query->where('code', $code);
+    }
+
     /**
      * Scope to only include categories of a given type.
      *
@@ -155,46 +169,50 @@ class Category extends Model
 
     /**
      * Scope to include only income.
+     * Uses Categories trait to support multiple income types (e.g. from modules).
      *
      * @param \Illuminate\Database\Eloquent\Builder $query
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeIncome($query)
     {
-        return $query->where($this->qualifyColumn('type'), '=', 'income');
+        return $query->whereIn($this->qualifyColumn('type'), $this->getIncomeCategoryTypes());
     }
 
     /**
      * Scope to include only expense.
+     * Uses Categories trait to support multiple expense types (e.g. from modules).
      *
      * @param \Illuminate\Database\Eloquent\Builder $query
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeExpense($query)
     {
-        return $query->where($this->qualifyColumn('type'), '=', 'expense');
+        return $query->whereIn($this->qualifyColumn('type'), $this->getExpenseCategoryTypes());
     }
 
     /**
      * Scope to include only item.
+     * Uses Categories trait to support multiple item types (e.g. from modules).
      *
      * @param \Illuminate\Database\Eloquent\Builder $query
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeItem($query)
     {
-        return $query->where($this->qualifyColumn('type'), '=', 'item');
+        return $query->whereIn($this->qualifyColumn('type'), $this->getItemCategoryTypes());
     }
 
     /**
      * Scope to include only other.
+     * Uses Categories trait to support multiple other types (e.g. from modules).
      *
      * @param \Illuminate\Database\Eloquent\Builder $query
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeOther($query)
     {
-        return $query->where($this->qualifyColumn('type'), '=', 'other');
+        return $query->whereIn($this->qualifyColumn('type'), $this->getOtherCategoryTypes());
     }
 
     public function scopeName($query, $name)
@@ -213,6 +231,17 @@ class Category extends Model
         return $query->withoutGlobalScope(new Scope);
     }
 
+    /**
+     * Scope gets only parent categories.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeIsNotSubCategory($query)
+    {
+        return $query->whereNull('parent_id');
+    }
+
     /**
      * Scope to export the rows of the current page filtered and sorted.
      *
@@ -233,7 +262,7 @@ class Category extends Model
 
         $search = $request->get('search');
 
-        $query->withSubcategory();
+        $query->withSubCategory();
 
         $query->usingSearchString($search)->sortable($sort);
 
@@ -261,9 +290,91 @@ class Category extends Model
     /**
      * Get the display name of the category.
      */
-    public function getDisplayNameAttribute()
+    public function getDisplayNameAttribute(): string
     {
-        return $this->name . ' (' . ucfirst($this->type) . ')';
+        $hideCode = $this->hideCodeCategoryType($this->type);
+        $typeNames = $this->getCategoryTypes();
+
+        $typeName = $typeNames[$this->type] ?? ucfirst($this->type);
+
+        $prefix = (!$hideCode && $this->code) ? $this->code . ' - ' : '';
+
+        return $prefix . $this->name . ' (' . $typeName . ')';
+    }
+
+    /**
+     * Get the balance of a category.
+     *
+     * @return double
+     */
+    public function getBalanceAttribute()
+    {
+        // If view composer has set the balance, return it directly
+        if (isset($this->de_balance)) {
+            return $this->de_balance;
+        }
+
+        $financial_year = $this->getFinancialYear();
+
+        $start_date = $financial_year->getStartDate();
+        $end_date = $financial_year->getEndDate();
+
+        $this->transactions->whereBetween('paid_at', [$start_date, $end_date])
+            ->each(function ($transaction) use (&$incomes, &$expenses) {
+                if (($transaction->isNotIncome() && $transaction->isNotExpense()) || $transaction->isTransferTransaction()) {
+                    return;
+                }
+
+                if ($transaction->isIncome()) {
+                    $incomes += $transaction->getAmountConvertedToDefault();
+                } else {
+                    $expenses += $transaction->getAmountConvertedToDefault();
+                }
+            });
+
+        $balance = $incomes - $expenses;
+
+        $this->sub_categories()
+            ->each(function ($sub_category) use (&$balance) {
+                $balance += $sub_category->balance;
+            });
+
+        return $balance;
+    }
+
+    /**
+     * Get the balance of a category without considering sub categories.
+     *
+     * @return double
+     */
+    public function getBalanceWithoutSubcategoriesAttribute()
+    {
+        // If view composer has set the balance, return it directly
+        if (isset($this->without_subcategory_de_balance)) {
+            return $this->without_subcategory_de_balance;
+        }
+
+        $financial_year = $this->getFinancialYear();
+
+        $start_date = $financial_year->getStartDate();
+        $end_date = $financial_year->getEndDate();
+
+        $this->transactions->whereBetween('paid_at', [$start_date, $end_date])
+            ->each(function ($transaction) use (&$incomes, &$expenses) {
+                if (($transaction->isNotIncome() && $transaction->isNotExpense()) || $transaction->isTransferTransaction()) {
+                    return;
+                }
+
+                if ($transaction->isIncome()) {
+                    $incomes += $transaction->getAmountConvertedToDefault();
+                } else {
+                    $expenses += $transaction->getAmountConvertedToDefault();
+                }
+            });
+
+        $balance = $incomes - $expenses;
+
+        return $balance;
     }
 
     /**
@@ -303,6 +414,19 @@ class Category extends Model
         return $actions;
     }
 
+    /**
+     * A no-op callback that gets fired when a model is cloning but before it gets
+     * committed to the database
+     *
+     * @param  Illuminate\Database\Eloquent\Model $src
+     * @param  boolean $child
+     * @return void
+     */
+    public function onCloning($src, $child = null)
+    {
+        $this->code = $this->getNextCategoryCode();
+    }
+
     /**
      * Create a new factory instance for the model.
      *

app/Models/Setting/Currency.php

@@ -102,6 +102,16 @@ class Currency extends Model
         return $this->contacts()->whereIn('contacts.type', (array) $this->getVendorTypes());
     }
 
+    /**
+     * Get the default currency.
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function default()
+    {
+        return $this->code(default_currency())->first();
+    }
+
     /**
      * Scope currency by code.
      *

app/Notifications/Auth/Invitation.php

@@ -42,9 +42,10 @@ class Invitation extends Notification
      * @param  mixed  $notifiable
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
-    public function toMail($notifiable)
+    public function toMail($notifiable): MailMessage
     {
         return (new MailMessage)
+            ->from(config('mail.from.address'), config('mail.from.name'))
             ->line(trans('auth.invitation.message_1'))
             ->action(trans('auth.invitation.button'), route('register', $this->invitation->token))
             ->line(trans('auth.invitation.message_2'));

app/Notifications/Auth/Reset.php

@@ -14,10 +14,18 @@ class Reset extends Notification
      */
     public $token;
 
+    /**
+     * The email address.
+     *
+     * @var string
+     */
+    public $email;
+
     /**
      * Create a notification instance.
      *
      * @param  string  $token
+     * @param  string  $email
      */
     public function __construct($token, $email)
     {
@@ -42,9 +50,10 @@ class Reset extends Notification
      * @param  mixed  $notifiable
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
-    public function toMail($notifiable)
+    public function toMail($notifiable): MailMessage
     {
         return (new MailMessage)
+            ->from(config('mail.from.address'), config('mail.from.name'))
             ->line(trans('auth.notification.message_1'))
             ->action(trans('auth.notification.button'), route('reset', ['token' => $this->token, 'email' => $this->email]))
             ->line(trans('auth.notification.message_2'));

app/Notifications/Common/DownloadCompleted.php

@@ -49,9 +49,10 @@ class DownloadCompleted extends Notification implements ShouldQueue
      * @param  mixed  $notifiable
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
-    public function toMail($notifiable)
+    public function toMail($notifiable): MailMessage
     {
         return (new MailMessage)
+            ->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(trans('notifications.download.completed.title'))
             ->line(new HtmlString('<br><br>'))
             ->line(trans('notifications.download.completed.description'))

app/Notifications/Common/DownloadFailed.php

@@ -48,9 +48,10 @@ class DownloadFailed extends Notification implements ShouldQueue
      * @param  mixed  $notifiable
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
-    public function toMail($notifiable)
+    public function toMail($notifiable): MailMessage
     {
         return (new MailMessage)
+            ->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(trans('notifications.download.failed.title'))
             ->line(new HtmlString('<br><br>'))
             ->line(trans('notifications.download.failed.description'))

app/Notifications/Common/ExportCompleted.php

@@ -49,9 +49,10 @@ class ExportCompleted extends Notification implements ShouldQueue
      * @param  mixed  $notifiable
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
-    public function toMail($notifiable)
+    public function toMail($notifiable): MailMessage
     {
         return (new MailMessage)
+            ->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(trans('notifications.export.completed.title'))
             ->line(new HtmlString('<br><br>'))
             ->line(trans('notifications.export.completed.description'))

app/Notifications/Common/ExportFailed.php

@@ -48,9 +48,10 @@ class ExportFailed extends Notification implements ShouldQueue
      * @param  mixed  $notifiable
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
-    public function toMail($notifiable)
+    public function toMail($notifiable): MailMessage
     {
         return (new MailMessage)
+            ->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(trans('notifications.export.failed.title'))
             ->line(new HtmlString('<br><br>'))
             ->line(trans('notifications.export.failed.description'))

app/Notifications/Common/ImportCompleted.php

@@ -44,11 +44,12 @@ class ImportCompleted extends Notification implements ShouldQueue
      * @param  mixed  $notifiable
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
-    public function toMail($notifiable)
+    public function toMail($notifiable): MailMessage
     {
         $dashboard_url = route('dashboard', ['company_id' => company_id()]);
 
         return (new MailMessage)
+            ->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(trans('notifications.import.completed.title'))
             ->line(new HtmlString('<br><br>'))
             ->line(trans('notifications.import.completed.description'))

app/Notifications/Common/ImportFailed.php

@@ -48,9 +48,10 @@ class ImportFailed extends Notification implements ShouldQueue
      * @param  mixed  $notifiable
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
-    public function toMail($notifiable)
+    public function toMail($notifiable): MailMessage
     {
         $message = (new MailMessage)
+            ->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(trans('notifications.import.failed.title'))
             ->line(new HtmlString('<br><br>'))
             ->line(trans('notifications.import.failed.description'));

app/Notifications/Email/InvalidEmail.php

@@ -49,11 +49,12 @@ class InvalidEmail extends Notification implements ShouldQueue
      * @param  mixed  $notifiable
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
-    public function toMail($notifiable)
+    public function toMail($notifiable): MailMessage
     {
         $dashboard_url = route('dashboard', ['company_id' => company_id()]);
 
         return (new MailMessage)
+            ->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(trans('notifications.email.invalid.title', ['type' => $this->type]))
             ->line(new HtmlString('<br><br>'))
             ->line(trans('notifications.email.invalid.description', ['email' => $this->email]))

app/Providers/Event.php

@@ -32,6 +32,7 @@ class Event extends Provider
             'App\Listeners\Update\V31\Version318',
             'App\Listeners\Update\V31\Version3112',
             'App\Listeners\Update\V31\Version3115',
+            'App\Listeners\Update\V31\Version3119',
         ],
         'Illuminate\Routing\Events\PreparingResponse' => [
             'App\Listeners\Common\PreparingResponse',
@@ -149,5 +150,6 @@ class Event extends Provider
         'App\Listeners\Report\AddBasis',
         'App\Listeners\Report\AddPeriod',
         'App\Listeners\Report\AddDate',
+        'App\Listeners\Report\AddDiscount',
     ];
 }

app/Reports/DiscountSummary.php

@@ -0,0 +1,125 @@
+<?php
+
+namespace App\Reports;
+
+use App\Abstracts\Report;
+use App\Models\Document\Document;
+use App\Utilities\Recurring;
+use App\Utilities\Date;
+use App\Traits\Currencies;
+use App\Events\Report\TotalCalculating;
+use App\Events\Report\TotalCalculated;
+
+class DiscountSummary extends Report
+{
+    use Currencies;
+
+    public $default_name = 'reports.discount_summary';
+
+    public $icon = 'sell';
+
+    public $type = 'summary';
+
+    public $chart = [
+        'income' => [
+            'bar' => [
+                'colors' => [
+                    '#8bb475',
+                ],
+            ],
+            'donut' => [
+                //
+            ],
+        ],
+        'expense' => [
+            'bar' => [
+                'colors' => [
+                    '#fb7185',
+                ],
+            ],
+            'donut' => [
+                //
+            ],
+        ],
+    ];
+
+    public function setTables()
+    {
+        $this->tables = [
+            'income' => trans_choice('general.incomes', 1),
+            'expense' => trans_choice('general.expenses', 2),
+        ];
+    }
+
+    public function setData()
+    {
+        $invoices = $this->applyFilters(Document::invoice()->with('totals')->accrued(), ['date_field' => 'issued_at'])->get();
+        Recurring::reflect($invoices, 'issued_at');
+        $this->setTotals($invoices, 'issued_at', false, 'income');
+
+        // Bills
+        $bills = $this->applyFilters(Document::bill()->with('totals')->accrued(), ['date_field' => 'issued_at'])->get();
+        Recurring::reflect($bills, 'issued_at');
+        $this->setTotals($bills, 'issued_at', false, 'expense');
+    }
+
+    public function setTotals($items, $date_field, $check_type = false, $table = 'default', $with_tax = true)
+    {
+        event(new TotalCalculating($this, $items, $date_field, $check_type, $table, $with_tax));
+
+        $group_field = $this->getSetting('group') . '_id';
+
+        foreach ($items as $item) {
+            // Make groups extensible
+            $item = $this->applyGroups($item);
+
+            $date = $this->getFormattedDate(Date::parse($item->$date_field));
+
+            if (!isset($item->$group_field)) {
+                continue;
+            }
+
+            $group = $item->$group_field;
+
+            $totals = $item->totals;
+
+            foreach ($totals as $total) {
+                if (! in_array($total->code, ['item_discount', 'discount'])) {
+                    continue;
+                }
+
+                if (
+                    !isset($this->row_values[$table][$group])
+                    || !isset($this->row_values[$table][$group][$date])
+                    || !isset($this->footer_totals[$table][$date])
+                ) {
+                    continue;
+                }
+
+                $amount = $this->convertToDefault($total->amount, $item->currency_code, $item->currency_rate);
+
+                $type = ($item->type === Document::INVOICE_TYPE || $item->type === 'income') ? 'income' : 'expense';
+
+                if (($check_type == false) || ($type == 'income')) {
+                    $this->row_values[$table][$group][$date] += $amount;
+    
+                    $this->footer_totals[$table][$date] += $amount;
+                } else {
+                    $this->row_values[$table][$group][$date] -= $amount;
+    
+                    $this->footer_totals[$table][$date] -= $amount;
+                }
+            }
+        }
+
+        event(new TotalCalculated($this, $items, $date_field, $check_type, $table, $with_tax));
+    }
+
+    public function getFields()
+    {
+        return [
+            $this->getGroupField(),
+            $this->getPeriodField(),
+        ];
+    }
+}

app/Reports/ProfitLoss.php

@@ -97,4 +97,19 @@ class ProfitLoss extends Report
             }
         }
     }
+
+    public function array(): array
+    {
+        $data = parent::array();
+
+        $net_profit = $this->net_profit;
+
+        if ($this->has_money) {
+            $net_profit = array_map(fn($value) => money($value)->format(), $net_profit);
+        }
+
+        $data['net_profit'] = $net_profit;
+
+        return $data;
+    }
 }

app/Reports/TaxSummary.php

@@ -4,11 +4,13 @@ namespace App\Reports;
 
 use App\Abstracts\Report;
 use App\Models\Banking\Transaction;
+use App\Models\Banking\TransactionTax;
 use App\Models\Document\Document;
 use App\Models\Setting\Tax;
 use App\Traits\Currencies;
 use App\Utilities\Recurring;
 use App\Utilities\Date;
+use Illuminate\Support\Str;
 
 class TaxSummary extends Report
 {
@@ -18,6 +20,8 @@ class TaxSummary extends Report
 
     public $category = 'general.accounting';
 
+    public $group = 'tax';
+
     public $icon = 'percent';
 
     public $type = 'detail';
@@ -68,6 +72,14 @@ class TaxSummary extends Report
 
                 break;
         }
+
+        // Incomes 
+        $incomes = $this->applyFilters(Transaction::with('taxes')->income()->isNotDocument()->isNotTransfer(), ['date_field' => 'paid_at'])->get();
+        $this->setTotals($incomes, 'paid_at');
+
+        // Expenses
+        $expenses = $this->applyFilters(Transaction::with('taxes')->expense()->isNotDocument()->isNotTransfer(), ['date_field' => 'paid_at'])->get();
+        $this->setTotals($expenses, 'paid_at');
     }
 
     public function setTotals($items, $date_field, $check_type = false, $table = 'default', $with_tax = true)
@@ -78,6 +90,11 @@ class TaxSummary extends Report
 
             $type = ($item->type === Document::INVOICE_TYPE || $item->type === 'income') ? 'income' : 'expense';
 
+            if ($item instanceof Transaction && empty($item->document_id)) {
+                $this->setTransactionTaxTotal($item, $type, $date_field);
+                continue;
+            }
+
             $date = $this->getFormattedDate(Date::parse($item->$date_field));
 
             if ($date_field == 'paid_at') {
@@ -93,16 +110,28 @@ class TaxSummary extends Report
                     continue;
                 }
 
+                $item_total_name = $item_total->name;
+
                 if (
-                    !isset($this->row_values[$item_total->name][$type][$date])
-                    || !isset($this->footer_totals[$item_total->name][$date])
+                    !isset($this->row_values[$item_total_name][$type][$date])
+                    || !isset($this->footer_totals[$item_total_name][$date])
                 ) {
-                    continue;
+                    $item_total_name = Str::lcfirst($item_total_name); // #Clickup@86c3nzq4r
+
+                    if (!isset($this->row_values[$item_total_name][$type][$date])
+                        || !isset($this->footer_totals[$item_total_name][$date])
+                    ) {
+                        continue;
+                    }
                 }
 
                 if ($date_field == 'paid_at') {
-                    $rate = ($item->amount * 100) / $type_item->amount;
-                    $item_amount = ($item_total->amount / 100) * $rate;
+                    if ($type_item->amount != 0) {
+                        $rate = ($item->amount * 100) / $type_item->amount;
+                        $item_amount = ($item_total->amount / 100) * $rate;
+                    } else {
+                        $item_amount = $item_total->amount;
+                    }
                 } else {
                     $item_amount = $item_total->amount;
                 }
@@ -110,18 +139,48 @@ class TaxSummary extends Report
                 $amount = $this->convertToDefault($item_amount, $item->currency_code, $item->currency_rate);
 
                 if ($type == 'income') {
-                    $this->row_values[$item_total->name][$type][$date] += $amount;
+                    $this->row_values[$item_total_name][$type][$date] += $amount;
 
-                    $this->footer_totals[$item_total->name][$date] += $amount;
+                    $this->footer_totals[$item_total_name][$date] += $amount;
                 } else {
-                    $this->row_values[$item_total->name][$type][$date] -= $amount;
+                    $this->row_values[$item_total_name][$type][$date] -= $amount;
 
-                    $this->footer_totals[$item_total->name][$date] -= $amount;
+                    $this->footer_totals[$item_total_name][$date] -= $amount;
                 }
             }
         }
     }
 
+    public function setTransactionTaxTotal($item, $type, $date_field)
+    {
+        if (empty($item->taxes)) {
+            return;
+        }
+
+        $date = $this->getFormattedDate(Date::parse($item->$date_field));
+
+        foreach ($item->taxes as $tax) {
+            if (
+                !isset($this->row_values[$tax->name][$type][$date])
+                || !isset($this->footer_totals[$tax->name][$date])
+            ) {
+                continue;
+            }
+    
+            $amount = $this->convertToDefault($tax->amount, $item->currency_code, $item->currency_rate);
+    
+            if ($type == 'income') {
+                $this->row_values[$tax->name][$type][$date] += $amount;
+    
+                $this->footer_totals[$tax->name][$date] += $amount;
+            } else {
+                $this->row_values[$tax->name][$type][$date] -= $amount;
+    
+                $this->footer_totals[$tax->name][$date] -= $amount;
+            }
+        }
+    }
+
     public function getFields()
     {
         return [

app/Traits/Categories.php

@@ -8,10 +8,158 @@ use Illuminate\Support\Str;
 
 trait Categories
 {
-    public function getCategoryTypes(bool $translate = true): array
+    public function isIncomeCategory(): bool
     {
-        $types = [];
-        $configs = config('type.category');
+        $type = $this->type ?? $this->category->type ?? $this->model->type ?? Category::INCOME_TYPE;
+
+        return in_array($type, $this->getIncomeCategoryTypes());
+    }
+
+    public function isExpenseCategory(): bool
+    {
+        $type = $this->type ?? $this->category->type ?? $this->model->type ?? Category::EXPENSE_TYPE;
+
+        return in_array($type, $this->getExpenseCategoryTypes());
+    }
+
+    public function isItemCategory(): bool
+    {
+        $type = $this->type ?? $this->category->type ?? $this->model->type ?? Category::ITEM_TYPE;
+
+        return in_array($type, $this->getItemCategoryTypes());
+    }
+
+    public function isOtherCategory(): bool
+    {
+        $type = $this->type ?? $this->category->type ?? $this->model->type ?? Category::OTHER_TYPE;
+
+        return in_array($type, $this->getOtherCategoryTypes());
+    }
+
+    public function getTypeCategoryTypes(string $type, string $return = 'array'): string|array
+    {
+        switch ($type) {
+            case Category::INCOME_TYPE:
+                $types = $this->getIncomeCategoryTypes($return);
+                break;
+            case Category::EXPENSE_TYPE:
+                $types = $this->getExpenseCategoryTypes($return);
+                break;
+            case Category::ITEM_TYPE:
+                $types = $this->getItemCategoryTypes($return);
+                break;
+            case Category::OTHER_TYPE:
+                $types = $this->getOtherCategoryTypes($return);
+                break;
+            default:
+                $types = ($return == 'array') ? [$type] : $type;
+        }
+
+        return $types;
+    }
+
+    public function getIncomeCategoryTypes(string $return = 'array'): string|array
+    {
+        return $this->getCategoryTypesByIndex(Category::INCOME_TYPE, $return);
+    }
+
+    public function getExpenseCategoryTypes(string $return = 'array'): string|array
+    {
+        return $this->getCategoryTypesByIndex(Category::EXPENSE_TYPE, $return);
+    }
+
+    public function getItemCategoryTypes(string $return = 'array'): string|array
+    {
+        return $this->getCategoryTypesByIndex(Category::ITEM_TYPE, $return);
+    }
+
+    public function getOtherCategoryTypes(string $return = 'array'): string|array
+    {
+        return $this->getCategoryTypesByIndex(Category::OTHER_TYPE, $return);
+    }
+
+    public function getCategoryTypesByIndex(string $index, string $return = 'array'): string|array
+    {
+        $types = (string) setting('category.type.' . $index);
+
+        return ($return == 'array') ? explode(',', $types) : $types;
+    }
+
+    public function addIncomeCategoryType(string $new_type): void
+    {
+        $this->addCategoryType($new_type, Category::INCOME_TYPE);
+    }
+
+    public function addExpenseCategoryType(string $new_type): void
+    {
+        $this->addCategoryType($new_type, Category::EXPENSE_TYPE);
+    }
+
+    public function addItemCategoryType(string $new_type): void
+    {
+        $this->addCategoryType($new_type, Category::ITEM_TYPE);
+    }
+
+    public function addOtherCategoryType(string $new_type): void
+    {
+        $this->addCategoryType($new_type, Category::OTHER_TYPE);
+    }
+
+    public function addCategoryType(string $new_type, string $index): void
+    {
+        $types = !empty(setting('category.type.' . $index)) ? explode(',', setting('category.type.' . $index)) : [];
+
+        if (in_array($new_type, $types)) {
+            return;
+        }
+
+        $types[] = $new_type;
+
+        setting([
+            'category.type.' . $index => implode(',', $types),
+        ])->save();
+    }
+
+    public function isGroupCategoryType(): bool
+    {
+        $setting_category_types = setting('category.type');
+
+        foreach ($setting_category_types as $type => $category) {
+            $categories = explode(',', $category);
+
+            if (count($categories) > 1) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function hideCodeCategoryType(string $type, bool $default = true): bool
+    {
+        return $this->hideCodeCategoryTypes($type)[$type] ?? $default;
+    }
+
+    public function hideCodeCategoryTypes(string|array $types): array
+    {
+        $types = is_string($types) ? explode(',', $types) : $types;
+
+        $type_codes = [];
+
+        foreach ($types as $type) {
+            $config_type = config('type.category.' . $type, []);
+
+            $type_codes[$type] = ! empty($config_type['hide']) && in_array('code', $config_type['hide']) ? true : false;
+        }
+
+        return $type_codes;
+    }
+
+    public function getCategoryTypes(bool $translate = true, bool $group = false, array $types = []): array
+    {
+        $category_types = [];
+
+        $configs = empty($types) ? config('type.category') : array_intersect_key(config('type.category'), array_flip($types));
 
         foreach ($configs as $type => $attr) {
             $plural_type = Str::plural($type);
@@ -22,10 +170,47 @@ trait Categories
                 $name = $attr['alias'] . '::' . $name;
             }
 
-            $types[$type] = $translate ? trans_choice($name, 1) : $name;
+            if ($group) {
+                $group_key = $attr['group'] ?? $type;
+
+                $category_types[$group_key][$type] = $translate ? trans_choice($name, 1) : $name;
+            } else {
+                $category_types[$type] = $translate ? trans_choice($name, 1) : $name;
+            }
         }
 
-        return $types;
+        return $category_types;
+    }
+
+    public function getCategoryTabs(): array
+    {
+        $tabs = [];
+        $configs = config('type.category');
+
+        foreach ($configs as $type => $attr) {
+            $tab_key = 'categories-' . ($attr['group'] ?? $type);
+
+            if (isset($tabs[$tab_key])) {
+                $tabs[$tab_key]['key'] .= ',' . $type;
+                continue;
+            }
+
+            $plural_type = Str::plural($attr['group'] ?? $type);
+
+            $name = $attr['translation']['prefix'] . '.' . $plural_type;
+
+            if (!empty($attr['alias'])) {
+                $name = $attr['alias'] . '::' . $name;
+            }
+
+            $tabs[$tab_key] = [
+                'key' => $type,
+                'name' => trans_choice($name, 2),
+                'show_code' => $attr['show_code'] ?? false,
+            ];
+        }
+
+        return $tabs;
     }
 
     public function getCategoryWithoutChildren(int $id): mixed
@@ -36,7 +221,7 @@ trait Categories
     public function getTransferCategoryId(): mixed
     {
         // 1 hour set cache for same query
-        return Cache::remember('transferCategoryId', 60, function () {
+        return Cache::remember('transferCategoryId.' . company_id(), 60, function () {
             return Category::other()->pluck('id')->first();
         });
     }
@@ -62,4 +247,16 @@ trait Categories
 
         return $ids;
     }
+
+    /**
+     * Finds existing maximum code and increase it
+     *
+     * @return mixed
+     */
+    public function getNextCategoryCode()
+    {
+        return Category::isNotSubCategory()->get(['code'])->reject(function ($category) {
+            return !preg_match('/^[0-9]*$/', $category->code);
+        })->max('code') + 1;
+    }
 }

app/Traits/DateTime.php

@@ -53,7 +53,7 @@ trait DateTime
         return [$start, $end];
     }
 
-    public function getFinancialStart($year = null): Date
+    public function getFinancialStart($year = null, $date = null): Date
     {
         $start_of_year = Date::now()->startOfYear();
 
@@ -64,9 +64,8 @@ trait DateTime
         $year = $year ?? $start_of_year->year;
 
         $financial_start = Date::create($year, $month, $day);
-
-        if ((setting('localisation.financial_denote') == 'ends') && ($financial_start->dayOfYear != 1) || 
-            $financial_start->greaterThan(Date::now())
+        if ((setting('localisation.financial_denote') == 'ends') && ($financial_start->dayOfYear != 1) ||
+            $financial_start->greaterThan($date ?? Date::now())
         ) {
             $financial_start->subYear();
         }
@@ -74,10 +73,10 @@ trait DateTime
         return $financial_start;
     }
 
-    public function getFinancialWeek($year = null): CarbonPeriod
+    public function getFinancialWeek($year = null, $date = null): CarbonPeriod
     {
         $today = Date::today();
-        $financial_weeks = $this->getFinancialWeeks($year);
+        $financial_weeks = $this->getFinancialWeeks($year, $date);
 
         foreach ($financial_weeks as $week) {
             if ($today->lessThan($week->getStartDate()) || $today->greaterThan($week->getEndDate())) {
@@ -96,10 +95,10 @@ trait DateTime
         return $this_week;
     }
 
-    public function getFinancialMonth($year = null): CarbonPeriod
+    public function getFinancialMonth($year = null, $date = null): CarbonPeriod
     {
         $today = Date::today();
-        $financial_months = $this->getFinancialMonths($year);
+        $financial_months = $this->getFinancialMonths($year, $date);
 
         foreach ($financial_months as $month) {
             if ($today->lessThan($month->getStartDate()) || $today->greaterThan($month->getEndDate())) {
@@ -118,10 +117,10 @@ trait DateTime
         return $this_month;
     }
 
-    public function getFinancialQuarter($year = null): CarbonPeriod
+    public function getFinancialQuarter($year = null, $date = null): CarbonPeriod
     {
         $today = Date::today();
-        $financial_quarters = $this->getFinancialQuarters($year);
+        $financial_quarters = $this->getFinancialQuarters($year, $date);
 
         foreach ($financial_quarters as $quarter) {
             if ($today->lessThan($quarter->getStartDate()) || $today->greaterThan($quarter->getEndDate())) {
@@ -140,23 +139,23 @@ trait DateTime
         return $this_quarter;
     }
 
-    public function getFinancialYear($year = null): CarbonPeriod
+    public function getFinancialYear($year = null, $date = null): CarbonPeriod
     {
-        $financial_start = $this->getFinancialStart($year);
+        $financial_start = $this->getFinancialStart($year, $date);
 
         return CarbonPeriod::create($financial_start, $financial_start->copy()->addYear()->subDay()->endOfDay());
     }
 
-    public function getFinancialWeeks($year = null): array
+    public function getFinancialWeeks($year = null, $date = null): array
     {
         $weeks = [];
 
-        $start = $this->getFinancialStart($year);
+        $start = $this->getFinancialStart($year, $date);
 
         $w = 52;
 
         if (request()->filled('start_date') && request()->filled('end_date')) {
-            $w = Date::parse(request('start_date'))->diffInWeeks(Date::parse(request('end_date'))) + 1;
+            $w = Date::parse($start->copy())->diffInWeeks(Date::parse(request('end_date'))) + 1;
         }
 
         for ($i = 0; $i < $w; $i++) {
@@ -166,16 +165,16 @@ trait DateTime
         return $weeks;
     }
 
-    public function getFinancialMonths($year = null): array
+    public function getFinancialMonths($year = null, $date = null): array
     {
         $months = [];
 
-        $start = $this->getFinancialStart($year);
+        $start = $this->getFinancialStart($year, $date);
 
         $m = 12;
 
         if (request()->filled('start_date') && request()->filled('end_date')) {
-            $m = Date::parse(request('start_date'))->diffInMonths(Date::parse(request('end_date'))) + 1;
+            $m = Date::parse($start->copy())->diffInMonths(Date::parse(request('end_date'))) + 1;
         }
 
         for ($i = 0; $i < $m; $i++) {
@@ -185,16 +184,21 @@ trait DateTime
         return $months;
     }
 
-    public function getFinancialQuarters($year = null): array
+    public function getFinancialQuarters($year = null, $date = null): array
     {
         $quarters = [];
 
-        $start = $this->getFinancialStart($year);
+        $start = $this->getFinancialStart($year, $date);
 
         $q = 4;
 
+        /*
+            Previously, diffInQuarters was calculated from start_date, which caused errors
+            when the financial start value differed from the default value.
+            Therefore, this change has been made. Ticket: #8106
+         */
         if (request()->filled('start_date') && request()->filled('end_date')) {
-            $q = Date::parse(request('start_date'))->diffInQuarters(Date::parse(request('end_date'))) + 1;
+            $q = Date::parse($start->copy())->diffInQuarters(Date::parse(request('end_date'))) + 1;
         }
 
         for ($i = 0; $i < $q; $i++) {
@@ -285,7 +289,7 @@ trait DateTime
 
         switch ($period) {
             case 'yearly':
-                $financial_year = $this->getFinancialYear($year);
+                $financial_year = $this->getFinancialYear($year, $date);
 
                 if ($date->greaterThanOrEqualTo($financial_year->getStartDate()) && $date->lessThanOrEqualTo($financial_year->getEndDate())) {
                     if (setting('localisation.financial_denote') == 'begins') {
@@ -297,7 +301,7 @@ trait DateTime
 
                 break;
             case 'quarterly':
-                $quarters = $this->getFinancialQuarters($year);
+                $quarters = $this->getFinancialQuarters($year, $date);
 
                 foreach ($quarters as $quarter) {
                     if ($date->lessThan($quarter->getStartDate()) || $date->greaterThan($quarter->getEndDate())) {
@@ -314,7 +318,7 @@ trait DateTime
 
                 break;
             case 'weekly':
-                $weeks = $this->getFinancialWeeks($year);
+                $weeks = $this->getFinancialWeeks($year, $date);
 
                 foreach ($weeks as $week) {
                     if ($date->lessThan($week->getStartDate()) || $date->greaterThan($week->getEndDate())) {
@@ -366,4 +370,4 @@ trait DateTime
     {
         return $this->scopeDateFilter($query, $field);
     }
-}
+}

app/Traits/Documents.php

@@ -28,7 +28,7 @@ trait Documents
 
     public function isNotRecurringDocument(): bool
     {
-        return ! $this->isRecurring();
+        return ! $this->isRecurringDocument();
     }
 
     public function getRecurringDocumentTypes() : array
@@ -206,7 +206,8 @@ trait Documents
 
         $today = Date::today()->toDateString();
 
-        $documents = $documents ?: Document::type($type)->with('transactions')->future();
+        // Eager load transactions with currency to prevent N+1 queries when calling getAmountConvertedToDefault()
+        $documents = $documents ?: Document::type($type)->with(['transactions', 'transactions.currency'])->future();
 
         $documents->each(function ($document) use (&$totals, $today) {
             if (! in_array($document->status, $this->getDocumentStatusesForFuture())) {
@@ -267,6 +268,13 @@ trait Documents
         return true;
     }
 
+    public function getRealTypeOfDocument(string $type): string
+    {
+        $type = $this->getRealTypeOfRecurringDocument($type);
+
+        return $type;
+    }
+
     public function getRealTypeOfRecurringDocument(string $recurring_type): string
     {
         return Str::replace('-recurring', '', $recurring_type);