Auto commit for release 'develop' on 2024-04-29

Bumps [chartjs-chart-sankey](https://github.com/kurkle/chartjs-chart-sankey) from 0.12.0 to 0.12.1.
- [Release notes](https://github.com/kurkle/chartjs-chart-sankey/releases)
- [Commits](https://github.com/kurkle/chartjs-chart-sankey/compare/v0.12.0...v0.12.1)

---
updated-dependencies:
- dependency-name: chartjs-chart-sankey
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

THANKS.md

@@ -0,0 +1,193 @@
+# Thank you! :tada: :heart: :tada:
+
+Over time, many people have contributed to Firefly III. Their efforts are not always visible, but always remembered and appreciated.
+Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.
+
+## 2024
+- imlonghao
+- Rahman Yusuf
+- Michael Thomas
+- WardenJakx
+- kuilin
+- Stevie Robinson
+- luzpaz
+- Lemuel Roberto Bonifácio
+- maureenferreira
+
+## 2023
+- tieu1991
+- Maxco10
+- zqye
+- Mateus Pereira
+- josephbadow
+- Christian Desktop
+- Edgars
+- Hannah K
+- noxonad
+- Kaijia Feng
+- Marc Ordinas i Llopis
+- Kuba Turek
+- Julien Stébenne
+
+## 2022
+- Johannes Zellner
+- Janne Heß
+- charlesteets
+- Nathan PERIER
+- Jan Willhaus
+- canoine
+- Rick Cuddy
+- James
+- Hugo Meyronneinc
+- naveen
+- neilnaveen
+- naveensrinivasan
+- Federico Micelli
+- George Hahn
+
+## 2021
+- StillLoading
+- Igor Rzegocki
+- Lorenzo Breda
+- Hosh
+- Flightkick
+- alex6480
+- VREEdom
+- Hamza FADIL
+- Kasper Læssø Sørensen
+- Alex
+- Jeroen De Meerleer
+- Ruben van Erk
+- Fabian Zimmermann
+- Mirko Berger
+- KaihatsuOnline
+- MihataBG
+
+## 2020
+- Hannes Körber
+- Julien Cassagne
+- bu4ak
+- Viktor Yakovlev
+- Oliver Kaufmann
+- Arvind Chembarpu
+- GrayStrider
+- psychowood
+- Hosh Sadiq
+- emansih
+- Aniruddha Maru
+- johnny
+- sephrat
+- bpatath
+- Florian Dupret
+- Maxim Kurbatov
+- Lucas Guima
+- Sandro
+- Ruben Verhoef
+- Daniel Idzerda
+- Calum Smith
+- Agraphie
+- Tomer Shvueli
+- Tomer S
+
+## 2019
+- Pascal Jungblut
+- Justyn Shull
+- Timendum
+- Nicolas Lœuillet
+- Dominic Guhl
+- Melroy van den Berg
+- Henning Stein
+- Jan Klepek
+- Jonathan
+- Geoffrey “Frogeye” Preud'homme
+- Michael Fix
+- Juraj Mlich
+- Eddybrando Vásquez
+- hulloanson
+- Will Rouesnel
+- lastlink
+- Mr. Funk
+- Simon Taddiken
+- Joris
+- Bastiaan Nijkamp
+
+## 2018
+- a1ex4
+- Daniel Quah
+- Marco Lourenço
+- Dennis Enderink
+- Luca Bognolo
+- Mike Conway
+- Ben
+- Mathieu Post
+- George Hertz
+- HamuZ HamuZ
+- David Meiseles
+- Erik Gelderblom
+- Luca Vallerini
+- Clemens Wijnekus
+- Jacob Weisz
+- Mateusz Gozdek
+- anmol26s
+- Kevin Hellemun
+- Shashank M Chakravarthy
+- Nico Schreiner
+- Paul Sohier
+- Brenden Conte
+- Ben Yanke
+- Andrew Prokhorenkov
+- devlearner
+- Kelvin
+- J'informatique
+
+## 2017
+- Victor Mosin
+- Justin
+- Hugo van Duijn
+- Lukas Winkler
+- Marcin Szymanski
+- Jens Kat
+- koziolek
+- jleeong
+- Simon Hanna
+- richard & xeli.eu
+- Sergey Besedin
+- Welbert Serra
+- Joris de Vries
+- Patrick Kostjens
+- Enrico Lamperti
+- Christian Musa
+- Enno Lohmeier
+
+## 2016
+- Sander
+- Toon Schoenmakers
+- Telyn
+- Sander Kleykens
+- Tom van der Werf
+- Matthew Peck
+- Sander Mulders
+- Bonno Nachtegaal-Karels
+- Niek Haarman
+- Edwin
+- Thijs Alkemade
+- zjean
+- Graham Miller
+- Robert Horlings
+- leander091
+
+## 2015
+- Antonio Spinelli
+- Colin O'Dell
+- RonaldvanMeer
+- Richard Ebbers
+- Balazs Varkonyi
+- Niek van der Kooy
+- Ilya Kil
+
+## 2014
+- Stewart Malik
+- Graham Campbell
+
+
+Thank you for all your support!

app/Api/V1/Controllers/User/PreferencesController.php

@@ -32,6 +32,7 @@ use FireflyIII\Models\Preference;
 use FireflyIII\Transformers\PreferenceTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
@@ -97,6 +98,32 @@ class PreferencesController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
+    /**
+     * TODO This endpoint is not documented.
+     *
+     * Return a single preference by name.
+     */
+    public function showList(Collection $collection): JsonResponse
+    {
+        $manager     = $this->getManager();
+        $count       = $collection->count();
+        $pageSize    = $this->parameters->get('limit');
+        $preferences = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator   = new LengthAwarePaginator($preferences, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.preferences.show-list').$this->buildParams());
+
+        /** @var PreferenceTransformer $transformer */
+        $transformer = app(PreferenceTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource    = new FractalCollection($preferences, $transformer, self::RESOURCE_KEY);
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/preferences/storePreference

app/Api/V2/Controllers/Autocomplete/AccountController.php

@@ -55,11 +55,7 @@ class AccountController extends Controller
             function ($request, $next) {
                 $this->repository      = app(AccountRepositoryInterface::class);
                 $this->adminRepository = app(AdminAccountRepositoryInterface::class);
-
-                $userGroup             = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->adminRepository->setUserGroup($userGroup);
-                }
+                $this->adminRepository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }
@@ -85,7 +81,7 @@ class AccountController extends Controller
         $types           = $data['types'];
         $query           = $data['query'];
         $date            = $this->parameters->get('date') ?? today(config('app.timezone'));
-        $result          = $this->adminRepository->searchAccount((string)$query, $types, $data['limit']);
+        $result          = $this->adminRepository->searchAccount((string) $query, $types, $data['limit']);
         $defaultCurrency = app('amount')->getDefaultCurrency();
         $groupedResult   = [];
         $allItems        = [];
@@ -99,19 +95,19 @@ class AccountController extends Controller
                 $balance         = app('steam')->balance($account, $date);
                 $nameWithBalance = sprintf('%s (%s)', $account->name, app('amount')->formatAnything($currency, $balance, false));
             }
-            $type            = (string)trans(sprintf('firefly.%s', $account->accountType->type));
+            $type            = (string) trans(sprintf('firefly.%s', $account->accountType->type));
             $groupedResult[$type] ??= [
                 'group ' => $type,
                 'items'  => [],
             ];
             $allItems[]      = [
-                'id'                      => (string)$account->id,
-                'value'                   => (string)$account->id,
+                'id'                      => (string) $account->id,
+                'value'                   => (string) $account->id,
                 'name'                    => $account->name,
                 'name_with_balance'       => $nameWithBalance,
                 'label'                   => $nameWithBalance,
                 'type'                    => $account->accountType->type,
-                'currency_id'             => (string)$currency->id,
+                'currency_id'             => (string) $currency->id,
                 'currency_name'           => $currency->name,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
@@ -123,8 +119,8 @@ class AccountController extends Controller
             $allItems,
             static function (array $left, array $right): int {
                 $order    = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
-                $posLeft  = (int)array_search($left['type'], $order, true);
-                $posRight = (int)array_search($right['type'], $order, true);
+                $posLeft  = (int) array_search($left['type'], $order, true);
+                $posRight = (int) array_search($right['type'], $order, true);
 
                 return $posLeft - $posRight;
             }

app/Api/V2/Controllers/Autocomplete/CategoryController.php

@@ -45,11 +45,7 @@ class CategoryController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(CategoryRepositoryInterface::class);
-
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Autocomplete/TagController.php

@@ -45,11 +45,7 @@ class TagController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(TagRepositoryInterface::class);
-
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Autocomplete/TransactionController.php

@@ -45,11 +45,7 @@ class TransactionController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(JournalRepositoryInterface::class);
-
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Chart/AccountController.php

@@ -55,8 +55,7 @@ class AccountController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(AccountRepositoryInterface::class);
-                $userGroup        = $this->validateUserGroup($request);
-                $this->repository->setUserGroup($userGroup);
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Chart/BudgetController.php

@@ -64,12 +64,9 @@ class BudgetController extends Controller
                 $this->blRepository  = app(BudgetLimitRepositoryInterface::class);
                 $this->opsRepository = app(OperationsRepositoryInterface::class);
                 $this->currency      = app('amount')->getDefaultCurrency();
-
                 $userGroup           = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                    $this->opsRepository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($userGroup);
+                $this->opsRepository->setUserGroup($userGroup);
 
                 return $next($request);
             }
@@ -124,11 +121,11 @@ class BudgetController extends Controller
         foreach ($rows as $row) {
             $current  = [
                 'label'                          => $budget->name,
-                'currency_id'                    => (string)$row['currency_id'],
+                'currency_id'                    => (string) $row['currency_id'],
                 'currency_code'                  => $row['currency_code'],
                 'currency_name'                  => $row['currency_name'],
                 'currency_decimal_places'        => $row['currency_decimal_places'],
-                'native_currency_id'             => (string)$row['native_currency_id'],
+                'native_currency_id'             => (string) $row['native_currency_id'],
                 'native_currency_code'           => $row['native_currency_code'],
                 'native_currency_name'           => $row['native_currency_name'],
                 'native_currency_decimal_places' => $row['native_currency_decimal_places'],
@@ -189,12 +186,12 @@ class BudgetController extends Controller
         foreach ($array as $currencyId => $block) {
             $this->currencies[$currencyId] ??= TransactionCurrency::find($currencyId);
             $return[$currencyId]           ??= [
-                'currency_id'                    => (string)$currencyId,
+                'currency_id'                    => (string) $currencyId,
                 'currency_code'                  => $block['currency_code'],
                 'currency_name'                  => $block['currency_name'],
                 'currency_symbol'                => $block['currency_symbol'],
-                'currency_decimal_places'        => (int)$block['currency_decimal_places'],
-                'native_currency_id'             => (string)$this->currency->id,
+                'currency_decimal_places'        => (int) $block['currency_decimal_places'],
+                'native_currency_id'             => (string) $this->currency->id,
                 'native_currency_code'           => $this->currency->code,
                 'native_currency_name'           => $this->currency->name,
                 'native_currency_symbol'         => $this->currency->symbol,

app/Api/V2/Controllers/Chart/CategoryController.php

@@ -57,10 +57,7 @@ class CategoryController extends Controller
             function ($request, $next) {
                 $this->accountRepos  = app(AccountRepositoryInterface::class);
                 $this->currencyRepos = app(CurrencyRepositoryInterface::class);
-                $userGroup           = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->accountRepos->setUserGroup($userGroup);
-                }
+                $this->accountRepos->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }
@@ -100,25 +97,25 @@ class CategoryController extends Controller
 
         /** @var array $journal */
         foreach ($journals as $journal) {
-            $currencyId                    = (int)$journal['currency_id'];
+            $currencyId                    = (int) $journal['currency_id'];
             $currency                      = $currencies[$currencyId] ?? $this->currencyRepos->find($currencyId);
             $currencies[$currencyId]       = $currency;
-            $categoryName                  = null === $journal['category_name'] ? (string)trans('firefly.no_category') : $journal['category_name'];
+            $categoryName                  = null === $journal['category_name'] ? (string) trans('firefly.no_category') : $journal['category_name'];
             $amount                        = app('steam')->positive($journal['amount']);
             $nativeAmount                  = $converter->convert($default, $currency, $journal['date'], $amount);
             $key                           = sprintf('%s-%s', $categoryName, $currency->code);
-            if ((int)$journal['foreign_currency_id'] === $default->id) {
+            if ((int) $journal['foreign_currency_id'] === $default->id) {
                 $nativeAmount = app('steam')->positive($journal['foreign_amount']);
             }
             // create arrays
             $return[$key] ??= [
                 'label'                          => $categoryName,
-                'currency_id'                    => (string)$currency->id,
+                'currency_id'                    => (string) $currency->id,
                 'currency_code'                  => $currency->code,
                 'currency_name'                  => $currency->name,
                 'currency_symbol'                => $currency->symbol,
                 'currency_decimal_places'        => $currency->decimal_places,
-                'native_currency_id'             => (string)$default->id,
+                'native_currency_id'             => (string) $default->id,
                 'native_currency_code'           => $default->code,
                 'native_currency_name'           => $default->name,
                 'native_currency_symbol'         => $default->symbol,
@@ -138,7 +135,7 @@ class CategoryController extends Controller
 
         // order by native amount
         usort($return, static function (array $a, array $b) {
-            return (float)$a['native_amount'] < (float)$b['native_amount'] ? 1 : -1;
+            return (float) $a['native_amount'] < (float) $b['native_amount'] ? 1 : -1;
         });
         $converter->summarize();
 

app/Api/V2/Controllers/Controller.php

@@ -157,6 +157,9 @@ class Controller extends BaseController
     {
         $manager  = new Manager();
         $baseUrl  = request()->getSchemeAndHttpHost().'/api/v2';
+
+        // TODO add stuff to path?
+
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         $objects  = $paginator->getCollection();

app/Api/V2/Controllers/Model/Account/IndexController.php

@@ -57,21 +57,24 @@ class IndexController extends Controller
     }
 
     /**
+     * TODO the sort instructions need proper repeatable documentation.
      * TODO see autocomplete/account controller for list.
      */
     public function index(IndexRequest $request): JsonResponse
     {
         $this->repository->resetAccountOrder();
-        $types        = $request->getAccountTypes();
-        $instructions = $request->getSortInstructions('accounts');
-        $accounts     = $this->repository->getAccountsByType($types, $instructions);
-        $pageSize     = $this->parameters->get('limit');
-        $count        = $accounts->count();
-        $accounts     = $accounts->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-        $paginator    = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
-        $transformer  = new AccountTransformer();
+        $types       = $request->getAccountTypes();
+        $sorting     = $request->getSortInstructions('accounts');
+        $filters     = $request->getFilterInstructions('accounts');
+        $accounts    = $this->repository->getAccountsByType($types, $sorting, $filters);
+        $pageSize    = $this->parameters->get('limit');
+        $count       = $accounts->count();
+        $accounts    = $accounts->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator   = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
+        $transformer = new AccountTransformer();
 
-        $this->parameters->set('sort', $instructions);
+        $this->parameters->set('sort', $sorting);
+        $this->parameters->set('filters', $filters);
         $transformer->setParameters($this->parameters); // give params to transformer
 
         return response()

app/Api/V2/Controllers/Model/Account/UpdateController.php

@@ -45,11 +45,7 @@ class UpdateController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(AccountRepositoryInterface::class);
-                // new way of user group validation
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Model/Bill/IndexController.php

@@ -46,12 +46,7 @@ class IndexController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(BillRepositoryInterface::class);
-
-                // new way of user group validation
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Model/Bill/ShowController.php

@@ -46,12 +46,7 @@ class ShowController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(BillRepositoryInterface::class);
-
-                // new way of user group validation
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Model/Bill/SumController.php

@@ -45,11 +45,7 @@ class SumController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(BillRepositoryInterface::class);
-
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Model/PiggyBank/IndexController.php

@@ -46,11 +46,7 @@ class IndexController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->repository = app(PiggyBankRepositoryInterface::class);
-
-                $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->repository->setUserGroup($this->validateUserGroup($request));
 
                 return $next($request);
             }

app/Api/V2/Controllers/Summary/NetWorthController.php

@@ -52,10 +52,8 @@ class NetWorthController extends Controller
                 $this->repository = app(AccountRepositoryInterface::class);
                 // new way of user group validation
                 $userGroup        = $this->validateUserGroup($request);
-                if (null !== $userGroup) {
-                    $this->netWorth->setUserGroup($userGroup);
-                    $this->repository->setUserGroup($userGroup);
-                }
+                $this->netWorth->setUserGroup($userGroup);
+                $this->repository->setUserGroup($userGroup);
 
                 return $next($request);
             }

app/Api/V2/Request/Model/Account/IndexRequest.php

@@ -27,6 +27,7 @@ use Carbon\Carbon;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\Support\Request\GetFilterInstructions;
 use FireflyIII\Support\Request\GetSortInstructions;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -40,6 +41,7 @@ class IndexRequest extends FormRequest
     use AccountFilter;
     use ChecksLogin;
     use ConvertsDataTypes;
+    use GetFilterInstructions;
     use GetSortInstructions;
 
     public function getAccountTypes(): array

app/Console/Commands/Integrity/CreateGroupMemberships.php

@@ -80,7 +80,7 @@ class CreateGroupMemberships extends Command
         // check if membership exists
         $userGroup  = UserGroup::where('title', $user->email)->first();
         if (null === $userGroup) {
-            $userGroup = UserGroup::create(['title' => $user->email, 'default_administration' => true]);
+            $userGroup = UserGroup::create(['title' => $user->email]);
         }
 
         $userRole   = UserRole::where('title', UserRoleEnum::OWNER->value)->first();

app/Http/Controllers/HomeController.php

@@ -151,8 +151,9 @@ class HomeController extends Controller
         }
 
         /** @var Carbon $start */
-        /** @var Carbon $end */
         $start          = session('start', today(config('app.timezone'))->startOfMonth());
+
+        /** @var Carbon $end */
         $end            = session('end', today(config('app.timezone'))->endOfMonth());
         $accounts       = $repository->getAccountsById($frontpageArray);
         $today          = today(config('app.timezone'));

app/Jobs/MailError.php

@@ -130,12 +130,12 @@ class MailError extends Job implements ShouldQueue
         }
         if (file_exists($file)) {
             Log::debug(sprintf('Read file in "%s"', $file));
-            $limits = json_decode(file_get_contents($file), true);
+            $limits = json_decode((string)file_get_contents($file), true);
         }
         // limit reached?
         foreach ($types as $type => $info) {
             Log::debug(sprintf('Now checking limit "%s"', $type), $info);
-            if (!isset($limits[$type])) {
+            if (!array_key_exists($type, $limits)) {
                 Log::debug(sprintf('Limit "%s" reset to zero, did not exist yet.', $type));
                 $limits[$type] = [
                     'time' => time(),

app/Models/UserGroup.php

@@ -98,7 +98,7 @@ class UserGroup extends Model
 {
     use ReturnsIntegerIdTrait;
 
-    protected $fillable = ['title', 'default_administration'];
+    protected $fillable = ['title'];
 
     /**
      * Route binder. Converts the key in the URL to the specified object (or throw 404).

app/Repositories/UserGroups/Account/AccountRepository.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Repositories\UserGroups\Account;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\AccountType;
+use FireflyIII\Models\ObjectGroup;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Services\Internal\Update\AccountUpdateService;
@@ -240,7 +241,7 @@ class AccountRepository implements AccountRepositoryInterface
         }
     }
 
-    public function getAccountsByType(array $types, ?array $sort = []): Collection
+    public function getAccountsByType(array $types, ?array $sort = [], ?array $filters = []): Collection
     {
         $sortable        = ['name', 'active']; // TODO yes this is a duplicate array.
         $res             = array_intersect([AccountType::ASSET, AccountType::MORTGAGE, AccountType::LOAN, AccountType::DEBT], $types);
@@ -249,6 +250,22 @@ class AccountRepository implements AccountRepositoryInterface
             $query->accountTypeIn($types);
         }
 
+        // process filters
+        // TODO this should be repeatable, it feels like a hack when you do it here.
+        // TODO some fields cannot be filtered using the query, and a second filter must be applied on the collection.
+        foreach ($filters as $column => $value) {
+            // filter on NULL values
+            if (null === $value) {
+                continue;
+            }
+            if ('active' === $column) {
+                $query->where('accounts.active', $value);
+            }
+            if ('name' === $column) {
+                $query->where('accounts.name', 'LIKE', sprintf('%%%s%%', $value));
+            }
+        }
+
         // add sort parameters. At this point they're filtered to allowed fields to sort by:
         $hasActiveColumn = array_key_exists('active', $sort);
         if (count($sort) > 0) {
@@ -337,4 +354,34 @@ class AccountRepository implements AccountRepositoryInterface
             ->get(['transactions.account_id', DB::raw('MAX(transaction_journals.date) as date_max')])->toArray() // @phpstan-ignore-line
         ;
     }
+
+    #[\Override]
+    public function getObjectGroups(Collection $accounts): array
+    {
+        $groupIds = [];
+        $return   = [];
+        $set      = DB::table('object_groupables')->where('object_groupable_type', Account::class)
+            ->whereIn('object_groupable_id', $accounts->pluck('id')->toArray())->get()
+        ;
+
+        /** @var \stdClass $row */
+        foreach ($set as $row) {
+            $groupIds[] = $row->object_group_id;
+        }
+        $groupIds = array_unique($groupIds);
+        $groups   = ObjectGroup::whereIn('id', $groupIds)->get();
+
+        /** @var \stdClass $row */
+        foreach ($set as $row) {
+            if (!array_key_exists($row->object_groupable_id, $return)) {
+                /** @var null|ObjectGroup $group */
+                $group = $groups->firstWhere('id', '=', $row->object_group_id);
+                if (null !== $group) {
+                    $return[$row->object_groupable_id] = ['title' => $group->title, 'order' => $group->order, 'id' => $group->id];
+                }
+            }
+        }
+
+        return $return;
+    }
 }

app/Repositories/UserGroups/Account/AccountRepositoryInterface.php

@@ -55,7 +55,7 @@ interface AccountRepositoryInterface
 
     public function getAccountsById(array $accountIds): Collection;
 
-    public function getAccountsByType(array $types, ?array $sort = []): Collection;
+    public function getAccountsByType(array $types, ?array $sort = [], ?array $filters = []): Collection;
 
     /**
      * Used in the infinite accounts list.
@@ -69,6 +69,8 @@ interface AccountRepositoryInterface
      */
     public function getMetaValue(Account $account, string $field): ?string;
 
+    public function getObjectGroups(Collection $accounts): array;
+
     public function getUserGroup(): UserGroup;
 
     /**

app/Support/Authentication/RemoteUserProvider.php

@@ -80,9 +80,10 @@ class RemoteUserProvider implements UserProvider
                 $roleObject = Role::where('name', 'owner')->first();
                 $user->roles()->attach($roleObject);
             }
-            // make sure the user gets an administration as well.
-            CreateGroupMemberships::createGroupMembership($user);
         }
+        // make sure the user gets an administration as well.
+        CreateGroupMemberships::createGroupMembership($user);
+
         app('log')->debug(sprintf('Going to return user #%d (%s)', $user->id, $user->email));
 
         return $user;

app/Support/Http/Api/ValidatesUserGroupTrait.php

@@ -81,7 +81,7 @@ trait ValidatesUserGroupTrait
             throw new AuthorizationException((string) trans('validation.belongs_user_or_user_group'));
         }
         Log::debug(sprintf('validateUserGroup: validate access of user to group #%d ("%s").', $groupId, $group->title));
-        $roles       = property_exists($this, 'acceptedRoles') ? $this->acceptedRoles : [];
+        $roles       = property_exists($this, 'acceptedRoles') ? $this->acceptedRoles : []; // @phpstan-ignore-line
         if (0 === count($roles)) {
             Log::debug('validateUserGroup: no roles defined, so no access.');
 

app/Support/Request/ConvertsDataTypes.php

@@ -159,9 +159,7 @@ trait ConvertsDataTypes
 
         if (method_exists($this, 'validateUserGroup')) { // @phpstan-ignore-line
             $userGroup = $this->validateUserGroup($this);
-            if (null !== $userGroup) {
-                $repository->setUserGroup($userGroup);
-            }
+            $repository->setUserGroup($userGroup);
         }
 
         // set administration ID

app/Support/Request/GetFilterInstructions.php

@@ -0,0 +1,77 @@
+<?php
+/*
+ * GetFilterInstructions.php
+ * Copyright (c) 2024 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Support\Request;
+
+trait GetFilterInstructions
+{
+    private const string INVALID_FILTER = '%INVALID_JAMES_%';
+
+    final public function getFilterInstructions(string $key): array
+    {
+        $config  = config(sprintf('firefly.filters.allowed.%s', $key));
+        $allowed = array_keys($config);
+        $set     = $this->get('filters', []);
+        $result  = [];
+        if (0 === count($set)) {
+            return [];
+        }
+        foreach ($set as $info) {
+            $column          = $info['column'] ?? 'NOPE';
+            $filterValue     = (string) ($info['filter'] ?? self::INVALID_FILTER);
+            if (false === in_array($column, $allowed, true)) {
+                // skip invalid column
+                continue;
+            }
+            $filterType      = $config[$column] ?? false;
+
+            switch ($filterType) {
+                default:
+                    exit(sprintf('Do not support filter type "%s"', $filterType));
+
+                case 'boolean':
+                    $filterValue = $this->booleanInstruction($filterValue);
+
+                    break;
+
+                case 'string':
+                    break;
+            }
+            $result[$column] = $filterValue;
+        }
+
+        return $result;
+    }
+
+    public function booleanInstruction(string $filterValue): ?bool
+    {
+        if ('true' === $filterValue) {
+            return true;
+        }
+        if ('false' === $filterValue) {
+            return false;
+        }
+
+        return null;
+    }
+}

app/Transformers/V2/AccountTransformer.php

@@ -41,11 +41,13 @@ class AccountTransformer extends AbstractTransformer
 {
     private array               $accountMeta;
     private array               $accountTypes;
+    private array               $fullTypes;
     private array               $balanceDifferences;
     private array               $convertedBalances;
     private array               $currencies;
     private TransactionCurrency $default;
     private array               $lastActivity;
+    private array               $objectGroups;
 
     /**
      * This method collects meta-data for one or all accounts in the transformer's collection.
@@ -55,7 +57,9 @@ class AccountTransformer extends AbstractTransformer
         $this->currencies         = [];
         $this->accountMeta        = [];
         $this->accountTypes       = [];
+        $this->fullTypes          = [];
         $this->lastActivity       = [];
+        $this->objectGroups       = [];
         $this->convertedBalances  = [];
         $this->balanceDifferences = [];
 
@@ -74,11 +78,14 @@ class AccountTransformer extends AbstractTransformer
         // get last activity:
         $this->getLastActivity($objects);
 
-        // TODO add balance difference
+        // add balance difference
         if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
             $this->getBalanceDifference($objects, $this->parameters->get('start'), $this->parameters->get('end'));
         }
 
+        // get object groups"
+        $this->getObjectGroups($objects);
+
         return $this->sortAccounts($objects);
     }
 
@@ -97,32 +104,44 @@ class AccountTransformer extends AbstractTransformer
      */
     public function transform(Account $account): array
     {
-        $id                = $account->id;
+        $id                 = $account->id;
 
         // various meta
-        $accountRole       = $this->accountMeta[$id]['account_role'] ?? null;
-        $accountType       = $this->accountTypes[$id];
-        $order             = $account->order;
+        $accountRole        = $this->accountMeta[$id]['account_role'] ?? null;
+        $accountType        = $this->accountTypes[$id];
+        $order              = $account->order;
+
+        // liability type
+        $liabilityType      = 'liabilities' === $accountType ? $this->fullTypes[$id] : null;
+        $liabilityDirection = $this->accountMeta[$id]['liability_direction'] ?? null;
+        $interest           = $this->accountMeta[$id]['interest'] ?? null;
+        $interestPeriod     = $this->accountMeta[$id]['interest_period'] ?? null;
+        $currentDebt        = $this->accountMeta[$id]['current_debt'] ?? null;
 
         // no currency? use default
-        $currency          = $this->default;
+        $currency           = $this->default;
         if (array_key_exists($id, $this->accountMeta) && 0 !== (int) ($this->accountMeta[$id]['currency_id'] ?? 0)) {
             $currency = $this->currencies[(int) $this->accountMeta[$id]['currency_id']];
         }
         // amounts and calculation.
-        $balance           = $this->balances[$id]['balance'] ?? null;
-        $nativeBalance     = $this->convertedBalances[$id]['native_balance'] ?? null;
+        $balance            = $this->balances[$id]['balance'] ?? null;
+        $nativeBalance      = $this->convertedBalances[$id]['native_balance'] ?? null;
 
         // no order for some accounts:
         if (!in_array(strtolower($accountType), ['liability', 'liabilities', 'asset'], true)) {
             $order = null;
         }
 
+        // object group
+        $objectGroupId      = $this->objectGroups[$id]['id'] ?? null;
+        $objectGroupOrder   = $this->objectGroups[$id]['order'] ?? null;
+        $objectGroupTitle   = $this->objectGroups[$id]['title'] ?? null;
+
         // balance difference
-        $diffStart         = null;
-        $diffEnd           = null;
-        $balanceDiff       = null;
-        $nativeBalanceDiff = null;
+        $diffStart          = null;
+        $diffEnd            = null;
+        $balanceDiff        = null;
+        $nativeBalanceDiff  = null;
         if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
             $diffStart         = $this->parameters->get('start')->toAtomString();
             $diffEnd           = $this->parameters->get('end')->toAtomString();
@@ -165,19 +184,25 @@ class AccountTransformer extends AbstractTransformer
             // more meta
             'last_activity'                  => array_key_exists($id, $this->lastActivity) ? $this->lastActivity[$id]->toAtomString() : null,
 
+            // liability stuff
+            'liability_type'                 => $liabilityType,
+            'liability_direction'            => $liabilityDirection,
+            'interest'                       => $interest,
+            'interest_period'                => $interestPeriod,
+            'current_debt'                   => $currentDebt,
+
+            // object group
+            'object_group_id'                => null !== $objectGroupId ? (string) $objectGroupId : null,
+            'object_group_order'             => $objectGroupOrder,
+            'object_group_title'             => $objectGroupTitle,
+
             //            'notes'                   => $this->repository->getNoteText($account),
             //            'monthly_payment_date'    => $monthlyPaymentDate,
             //            'credit_card_type'        => $creditCardType,
-            //            'account_number'          => $this->repository->getMetaValue($account, 'account_number'),
             //            'bic'                     => $this->repository->getMetaValue($account, 'BIC'),
             //            'virtual_balance'         => number_format((float) $account->virtual_balance, $decimalPlaces, '.', ''),
             //            'opening_balance'         => $openingBalance,
             //            'opening_balance_date'    => $openingBalanceDate,
-            //            'liability_type'          => $liabilityType,
-            //            'liability_direction'     => $liabilityDirection,
-            //            'interest'                => $interest,
-            //            'interest_period'         => $interestPeriod,
-            //            'current_debt'            => $this->repository->getMetaValue($account, 'current_debt'),
             //            'include_net_worth'       => $includeNetWorth,
             //            'longitude'               => $longitude,
             //            'latitude'                => $latitude,
@@ -212,7 +237,7 @@ class AccountTransformer extends AbstractTransformer
 
         /** @var AccountRepositoryInterface $accountRepository */
         $accountRepository = app(AccountRepositoryInterface::class);
-        $metaFields        = $accountRepository->getMetaValues($accounts, ['currency_id', 'account_role', 'account_number']);
+        $metaFields        = $accountRepository->getMetaValues($accounts, ['currency_id', 'account_role', 'account_number', 'liability_direction', 'interest', 'interest_period', 'current_debt']);
         $currencyIds       = $metaFields->where('name', 'currency_id')->pluck('data')->toArray();
 
         $currencies        = $repository->getByIds($currencyIds);
@@ -235,6 +260,7 @@ class AccountTransformer extends AbstractTransformer
         /** @var AccountType $row */
         foreach ($accountTypes as $row) {
             $this->accountTypes[$row->id] = (string) config(sprintf('firefly.shortNamesByFullName.%s', $row->type));
+            $this->fullTypes[$row->id]    = $row->type;
         }
     }
 
@@ -275,6 +301,9 @@ class AccountTransformer extends AbstractTransformer
             if ('balance_difference' === $column) {
                 $accounts = $this->sortByBalanceDifference($accounts, $direction);
             }
+            if ('current_debt' === $column) {
+                $accounts = $this->sortByCurrentDebt($accounts, $direction);
+            }
         }
 
         return $accounts;
@@ -365,4 +394,26 @@ class AccountTransformer extends AbstractTransformer
             return $rightBalance <=> $leftBalance;
         });
     }
+
+    private function sortByCurrentDebt(Collection $accounts, string $direction): Collection
+    {
+        $amounts = $this->accountMeta;
+
+        return $accounts->sort(function (Account $left, Account $right) use ($amounts, $direction) {
+            $leftCurrent  = (float) ($amounts[$left->id]['current_debt'] ?? 0);
+            $rightCurrent = (float) ($amounts[$right->id]['current_debt'] ?? 0);
+            if ('asc' === $direction) {
+                return $leftCurrent <=> $rightCurrent;
+            }
+
+            return $rightCurrent <=> $leftCurrent;
+        });
+    }
+
+    private function getObjectGroups(Collection $accounts): void
+    {
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository  = app(AccountRepositoryInterface::class);
+        $this->objectGroups = $accountRepository->getObjectGroups($accounts);
+    }
 }

changelog.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.1.15 - 2024-04-24
+
+### Fixed
+
+- [Issue 8812](https://github.com/firefly-iii/firefly-iii/issues/8812) (Login with `AUTHENTICATION_GUARD=remote_user_guard` fails due to missing UserGroup) reported by @nebulade
+
 ## 6.1.14 - 2024-04-24
 
 ### Changed

composer.lock

@@ -62,25 +62,25 @@
         },
         {
             "name": "brick/math",
-            "version": "0.11.0",
+            "version": "0.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478"
+                "reference": "f510c0a40911935b77b86859eb5223d58d660df1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/0ad82ce168c82ba30d1c01ec86116ab52f589478",
-                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478",
+                "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1",
+                "reference": "f510c0a40911935b77b86859eb5223d58d660df1",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.2",
-                "phpunit/phpunit": "^9.0",
-                "vimeo/psalm": "5.0.0"
+                "phpunit/phpunit": "^10.1",
+                "vimeo/psalm": "5.16.0"
             },
             "type": "library",
             "autoload": {
@@ -100,12 +100,17 @@
                 "arithmetic",
                 "bigdecimal",
                 "bignum",
+                "bignumber",
                 "brick",
-                "math"
+                "decimal",
+                "integer",
+                "math",
+                "mathematics",
+                "rational"
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.11.0"
+                "source": "https://github.com/brick/math/tree/0.12.1"
             },
             "funding": [
                 {
@@ -113,7 +118,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-01-15T23:15:59+00:00"
+            "time": "2023-11-29T23:19:16+00:00"
         },
         {
             "name": "carbonphp/carbon-doctrine-types",
@@ -1670,16 +1675,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.4.0",
+            "version": "v11.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "c1dc67c28811dc5be524a30b18f29ce62126716a"
+                "reference": "e3c24268f1404805e15099b9f035fe310cb30753"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/c1dc67c28811dc5be524a30b18f29ce62126716a",
-                "reference": "c1dc67c28811dc5be524a30b18f29ce62126716a",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/e3c24268f1404805e15099b9f035fe310cb30753",
+                "reference": "e3c24268f1404805e15099b9f035fe310cb30753",
                 "shasum": ""
             },
             "require": {
@@ -1871,20 +1876,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-04-16T14:38:51+00:00"
+            "time": "2024-04-23T15:11:31+00:00"
         },
         {
             "name": "laravel/passport",
-            "version": "v12.1.0",
+            "version": "v12.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/passport.git",
-                "reference": "ff4742c71c58a4941b8738496ba96dabdf5e395b"
+                "reference": "b24c6462835a16163141fbe588533d16603212b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/passport/zipball/ff4742c71c58a4941b8738496ba96dabdf5e395b",
-                "reference": "ff4742c71c58a4941b8738496ba96dabdf5e395b",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/b24c6462835a16163141fbe588533d16603212b7",
+                "reference": "b24c6462835a16163141fbe588533d16603212b7",
                 "shasum": ""
             },
             "require": {
@@ -1947,20 +1952,20 @@
                 "issues": "https://github.com/laravel/passport/issues",
                 "source": "https://github.com/laravel/passport"
             },
-            "time": "2024-04-15T18:49:04+00:00"
+            "time": "2024-04-17T17:56:14+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.1.19",
+            "version": "v0.1.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "0ab75ac3434d9f610c5691758a6146a3d1940c18"
+                "reference": "bf9a360c484976692de0f3792f30066f4f4b34a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/0ab75ac3434d9f610c5691758a6146a3d1940c18",
-                "reference": "0ab75ac3434d9f610c5691758a6146a3d1940c18",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/bf9a360c484976692de0f3792f30066f4f4b34a2",
+                "reference": "bf9a360c484976692de0f3792f30066f4f4b34a2",
                 "shasum": ""
             },
             "require": {
@@ -2002,9 +2007,9 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.19"
+                "source": "https://github.com/laravel/prompts/tree/v0.1.20"
             },
-            "time": "2024-04-16T14:20:35+00:00"
+            "time": "2024-04-18T00:45:25+00:00"
         },
         {
             "name": "laravel/sanctum",
@@ -5021,20 +5026,20 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.7.5",
+            "version": "4.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e"
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e",
-                "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088",
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12",
                 "ext-json": "*",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
@@ -5097,7 +5102,7 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.7.5"
+                "source": "https://github.com/ramsey/uuid/tree/4.7.6"
             },
             "funding": [
                 {
@@ -5109,7 +5114,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-08T05:53:05+00:00"
+            "time": "2024-04-27T21:32:50+00:00"
         },
         {
             "name": "rcrowe/twigbridge",
@@ -5189,16 +5194,16 @@
         },
         {
             "name": "spatie/backtrace",
-            "version": "1.5.3",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/backtrace.git",
-                "reference": "483f76a82964a0431aa836b6ed0edde0c248e3ab"
+                "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/backtrace/zipball/483f76a82964a0431aa836b6ed0edde0c248e3ab",
-                "reference": "483f76a82964a0431aa836b6ed0edde0c248e3ab",
+                "url": "https://api.github.com/repos/spatie/backtrace/zipball/8373b9d51638292e3bfd736a9c19a654111b4a23",
+                "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23",
                 "shasum": ""
             },
             "require": {
@@ -5206,6 +5211,7 @@
             },
             "require-dev": {
                 "ext-json": "*",
+                "laravel/serializable-closure": "^1.3",
                 "phpunit/phpunit": "^9.3",
                 "spatie/phpunit-snapshot-assertions": "^4.2",
                 "symfony/var-dumper": "^5.1"
@@ -5235,7 +5241,7 @@
                 "spatie"
             ],
             "support": {
-                "source": "https://github.com/spatie/backtrace/tree/1.5.3"
+                "source": "https://github.com/spatie/backtrace/tree/1.6.1"
             },
             "funding": [
                 {
@@ -5247,7 +5253,7 @@
                     "type": "other"
                 }
             ],
-            "time": "2023-06-28T12:59:17+00:00"
+            "time": "2024-04-24T13:22:11+00:00"
         },
         {
             "name": "spatie/flare-client-php",
@@ -5320,16 +5326,16 @@
         },
         {
             "name": "spatie/ignition",
-            "version": "1.13.2",
+            "version": "1.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/ignition.git",
-                "reference": "952798e239d9969e4e694b124c2cc222798dbb28"
+                "reference": "80385994caed328f6f9c9952926932e65b9b774c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/ignition/zipball/952798e239d9969e4e694b124c2cc222798dbb28",
-                "reference": "952798e239d9969e4e694b124c2cc222798dbb28",
+                "url": "https://api.github.com/repos/spatie/ignition/zipball/80385994caed328f6f9c9952926932e65b9b774c",
+                "reference": "80385994caed328f6f9c9952926932e65b9b774c",
                 "shasum": ""
             },
             "require": {
@@ -5399,20 +5405,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-04-16T08:49:17+00:00"
+            "time": "2024-04-26T08:45:51+00:00"
         },
         {
             "name": "spatie/laravel-html",
-            "version": "3.7.0",
+            "version": "3.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-html.git",
-                "reference": "df15763c190954ee46a74e0bf5b4b5bbf2e1f170"
+                "reference": "35802bd9b276ce08e1d9d15584b17fdef965063b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-html/zipball/df15763c190954ee46a74e0bf5b4b5bbf2e1f170",
-                "reference": "df15763c190954ee46a74e0bf5b4b5bbf2e1f170",
+                "url": "https://api.github.com/repos/spatie/laravel-html/zipball/35802bd9b276ce08e1d9d15584b17fdef965063b",
+                "reference": "35802bd9b276ce08e1d9d15584b17fdef965063b",
                 "shasum": ""
             },
             "require": {
@@ -5469,7 +5475,7 @@
                 "spatie"
             ],
             "support": {
-                "source": "https://github.com/spatie/laravel-html/tree/3.7.0"
+                "source": "https://github.com/spatie/laravel-html/tree/3.9.0"
             },
             "funding": [
                 {
@@ -5477,7 +5483,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2024-03-23T11:28:29+00:00"
+            "time": "2024-04-25T08:07:39+00:00"
         },
         {
             "name": "spatie/laravel-ignition",
@@ -10761,16 +10767,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.19",
+            "version": "10.5.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c726f0de022368f6ed103e452a765d3304a996a4"
+                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c726f0de022368f6ed103e452a765d3304a996a4",
-                "reference": "c726f0de022368f6ed103e452a765d3304a996a4",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3",
+                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3",
                 "shasum": ""
             },
             "require": {
@@ -10842,7 +10848,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.19"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20"
             },
             "funding": [
                 {
@@ -10858,7 +10864,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-17T14:06:18+00:00"
+            "time": "2024-04-24T06:32:35+00:00"
         },
         {
             "name": "sebastian/cli-parser",

config/debugbar.php

@@ -62,7 +62,7 @@ return [
     |
     */
 
-    'editor'                  => env('DEBUGBAR_EDITOR') ?: env('IGNITION_EDITOR', 'phpstorm'),
+    'editor'                  => env('DEBUGBAR_EDITOR') ?? env('IGNITION_EDITOR', 'phpstorm'),
 
     /*
     |--------------------------------------------------------------------------

config/firefly.php

@@ -117,7 +117,7 @@ return [
         'expression_engine' => false,
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => '6.1.14',
+    'version'                      => 'develop/2024-04-29',
     'api_version'                  => '2.0.14',
     'db_version'                   => 24,
 
@@ -920,11 +920,25 @@ return [
     // preselected account lists possibilities:
     'preselected_accounts'         => ['all', 'assets', 'liabilities'],
 
-    // allowed sort columns for API's
+    // allowed filters (search) for APIs
+    'filters'                      => [
+        'allowed' => [
+            'accounts' => [
+                'name'               => 'string',
+                'active'             => 'boolean',
+                'iban'               => 'iban',
+                'balance'            => 'numeric',
+                'last_activity'      => 'date',
+                'balance_difference' => 'numeric',
+            ],
+        ],
+    ],
+
+    // allowed sort columns for APIs
     'sorting'                      => [
         'allowed' => [
             'transactions' => ['description', 'amount'],
-            'accounts'     => ['name', 'active', 'iban', 'balance', 'last_activity', 'balance_difference'],
+            'accounts'     => ['name', 'active', 'iban', 'balance', 'last_activity', 'balance_difference', 'current_debt'],
         ],
     ],
 ];

config/translations.php

@@ -52,6 +52,15 @@ return [
                 'bad_type_destination',
             ],
             'firefly'    => [
+                'liability_direction_debit_short',
+                'liability_direction_credit_short',
+                'interest_calc_yearly',
+                'interest_calc_',
+                'interest_calc_daily',
+                'interest_calc_monthly',
+                'interest_calc_weekly',
+                'interest_calc_half-year',
+                'interest_calc_quarterly',
                 'spent',
                 'administration_owner',
                 'administration_you',

package-lock.json

@@ -2402,9 +2402,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.16.2.tgz",
-            "integrity": "sha512-VGodkwtEuZ+ENPz/CpDSl091koMv8ao5jHVMbG1vNK+sbx/48/wVzP84M5xSfDAC69mAKKoEkSo+ym9bXYRK9w==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.0.tgz",
+            "integrity": "sha512-nNvLvC2fjC+3+bHYN9uaGF3gcyy7RHGZhtl8TB/kINj9hiOQza8kWJGZh47GRPMrqeseO8U+Z8ElDMCZlWBdHA==",
             "cpu": [
                 "arm"
             ],
@@ -2415,9 +2415,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.16.2.tgz",
-            "integrity": "sha512-5/W1xyIdc7jw6c/f1KEtg1vYDBWnWCsLiipK41NiaWGLG93eH2edgE6EgQJ3AGiPERhiOLUqlDSfjRK08C9xFg==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.0.tgz",
+            "integrity": "sha512-+kjt6dvxnyTIAo7oHeYseYhDyZ7xRKTNl/FoQI96PHkJVxoChldJnne/LzYqpqidoK1/0kX0/q+5rrYqjpth6w==",
             "cpu": [
                 "arm64"
             ],
@@ -2428,9 +2428,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.16.2.tgz",
-            "integrity": "sha512-vOAKMqZSTbPfyPVu1jBiy+YniIQd3MG7LUnqV0dA6Q5tyhdqYtxacTHP1+S/ksKl6qCtMG1qQ0grcIgk/19JEA==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.0.tgz",
+            "integrity": "sha512-Oj6Tp0unMpGTBjvNwbSRv3DopMNLu+mjBzhKTt2zLbDJ/45fB1pltr/rqrO4bE95LzuYwhYn127pop+x/pzf5w==",
             "cpu": [
                 "arm64"
             ],
@@ -2441,9 +2441,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.16.2.tgz",
-            "integrity": "sha512-aIJVRUS3Dnj6MqocBMrcXlatKm64O3ITeQAdAxVSE9swyhNyV1dwnRgw7IGKIkDQofatd8UqMSyUxuFEa42EcA==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.0.tgz",
+            "integrity": "sha512-3nJx0T+yptxMd+v93rBRxSPTAVCv8szu/fGZDJiKX7kvRe9sENj2ggXjCH/KK1xZEmJOhaNo0c9sGMgGdfkvEw==",
             "cpu": [
                 "x64"
             ],
@@ -2454,9 +2454,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.16.2.tgz",
-            "integrity": "sha512-/bjfUiXwy3P5vYr6/ezv//Yle2Y0ak3a+Av/BKoi76nFryjWCkki8AuVoPR7ZU/ckcvAWFo77OnFK14B9B5JsA==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.0.tgz",
+            "integrity": "sha512-Vb2e8p9b2lxxgqyOlBHmp6hJMu/HSU6g//6Tbr7x5V1DlPCHWLOm37nSIVK314f+IHzORyAQSqL7+9tELxX3zQ==",
             "cpu": [
                 "arm"
             ],
@@ -2467,9 +2467,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.16.2.tgz",
-            "integrity": "sha512-S24b+tJHwpq2TNRz9T+r71FjMvyBBApY8EkYxz8Cwi/rhH6h+lu/iDUxyc9PuHf9UvyeBFYkWWcrDahai/NCGw==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.0.tgz",
+            "integrity": "sha512-Md60KsmC5ZIaRq/bYYDloklgU+XLEZwS2EXXVcSpiUw+13/ZASvSWQ/P92rQ9YDCL6EIoXxuQ829JkReqdYbGg==",
             "cpu": [
                 "arm"
             ],
@@ -2480,9 +2480,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.16.2.tgz",
-            "integrity": "sha512-UN7VAXLyeyGbCQWiOtQN7BqmjTDw1ON2Oos4lfk0YR7yNhFEJWZiwGtvj9Ay4lsT/ueT04sh80Sg2MlWVVZ+Ug==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.17.0.tgz",
+            "integrity": "sha512-zL5rBFtJ+2EGnMRm2TqKjdjgFqlotSU+ZJEN37nV+fiD3I6Gy0dUh3jBWN0wSlcXVDEJYW7YBe+/2j0N9unb2w==",
             "cpu": [
                 "arm64"
             ],
@@ -2493,9 +2493,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.16.2.tgz",
-            "integrity": "sha512-ZBKvz3+rIhQjusKMccuJiPsStCrPOtejCHxTe+yWp3tNnuPWtyCh9QLGPKz6bFNFbwbw28E2T6zDgzJZ05F1JQ==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.17.0.tgz",
+            "integrity": "sha512-s2xAyNkJqUdtRVgNK4NK4P9QttS538JuX/kfVQOdZDI5FIKVAUVdLW7qhGfmaySJ1EvN/Bnj9oPm5go9u8navg==",
             "cpu": [
                 "arm64"
             ],
@@ -2506,9 +2506,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.16.2.tgz",
-            "integrity": "sha512-LjMMFiVBRL3wOe095vHAekL4b7nQqf4KZEpdMWd3/W+nIy5o9q/8tlVKiqMbfieDypNXLsxM9fexOxd9Qcklyg==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.0.tgz",
+            "integrity": "sha512-7F99yzVT67B7IUNMjLD9QCFDCyHkyCJMS1dywZrGgVFJao4VJ9szrIEgH67cR+bXQgEaY01ur/WSL6B0jtcLyA==",
             "cpu": [
                 "ppc64"
             ],
@@ -2519,9 +2519,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.16.2.tgz",
-            "integrity": "sha512-ohkPt0lKoCU0s4B6twro2aft+QROPdUiWwOjPNTzwTsBK5w+2+iT9kySdtOdq0gzWJAdiqsV4NFtXOwGZmIsHA==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.0.tgz",
+            "integrity": "sha512-leFtyiXisfa3Sg9pgZJwRKITWnrQfhtqDjCamnZhkZuIsk1FXmYwKoTkp6lsCgimIcneFFkHKp/yGLxDesga4g==",
             "cpu": [
                 "riscv64"
             ],
@@ -2532,9 +2532,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.16.2.tgz",
-            "integrity": "sha512-jm2lvLc+/gqXfndlpDw05jKvsl/HKYxUEAt1h5UXcMFVpO4vGpoWmJVUfKDtTqSaHcCNw1his1XjkgR9aort3w==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.0.tgz",
+            "integrity": "sha512-FtOgui6qMJ4jbSXTxElsy/60LEe/3U0rXkkz2G5CJ9rbHPAvjMvI+3qF0A0fwLQ5hW+/ZC6PbnS2KfRW9JkgDQ==",
             "cpu": [
                 "s390x"
             ],
@@ -2545,9 +2545,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.16.2.tgz",
-            "integrity": "sha512-oc5/SlITI/Vj/qL4UM+lXN7MERpiy1HEOnrE+SegXwzf7WP9bzmZd6+MDljCEZTdSY84CpvUv9Rq7bCaftn1+g==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.0.tgz",
+            "integrity": "sha512-v6eiam/1w3HUfU/ZjzIDodencqgrSqzlNuNtiwH7PFJHYSo1ezL0/UIzmS2lpSJF1ORNaplXeKHYmmdt81vV2g==",
             "cpu": [
                 "x64"
             ],
@@ -2558,9 +2558,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.16.2.tgz",
-            "integrity": "sha512-/2VWEBG6mKbS2itm7hzPwhIPaxfZh/KLWrYg20pCRLHhNFtF+epLgcBtwy3m07bl/k86Q3PFRAf2cX+VbZbwzQ==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.17.0.tgz",
+            "integrity": "sha512-OUhkSdpM5ofVlVU2k4CwVubYwiwu1a4jYWPpubzN7Vzao73GoPBowHcCfaRSFRz1SszJ3HIsk3dZYk4kzbqjgw==",
             "cpu": [
                 "x64"
             ],
@@ -2571,9 +2571,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.16.2.tgz",
-            "integrity": "sha512-Wg7ANh7+hSilF0lG3e/0Oy8GtfTIfEk1327Bw8juZOMOoKmJLs3R+a4JDa/4cHJp2Gs7QfCDTepXXcyFD0ubBg==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.0.tgz",
+            "integrity": "sha512-uL7UYO/MNJPGL/yflybI+HI+n6+4vlfZmQZOCb4I+z/zy1wisHT3exh7oNQsnL6Eso0EUTEfgQ/PaGzzXf6XyQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2584,9 +2584,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.16.2.tgz",
-            "integrity": "sha512-J/jCDKVMWp0Y2ELnTjpQFYUCUWv1Jr+LdFrJVZtdqGyjDo0PHPa7pCamjHvJel6zBFM3doFFqAr7cmXYWBAbfw==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.0.tgz",
+            "integrity": "sha512-4WnSgaUiUmXILwFqREdOcqvSj6GD/7FrvSjhaDjmwakX9w4Z2F8JwiSP1AZZbuRkPqzi444UI5FPv33VKOWYFQ==",
             "cpu": [
                 "ia32"
             ],
@@ -2597,9 +2597,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.16.2.tgz",
-            "integrity": "sha512-3nIf+SJMs2ZzrCh+SKNqgLVV9hS/UY0UjT1YU8XQYFGLiUfmHYJ/5trOU1XSvmHjV5gTF/K3DjrWxtyzKKcAHA==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.0.tgz",
+            "integrity": "sha512-ve+D8t1prRSRnF2S3pyDtTXDlvW1Pngbz76tjgYFQW1jxVSysmQCZfPoDAo4WP+Ano8zeYp85LsArZBI12HfwQ==",
             "cpu": [
                 "x64"
             ],
@@ -2943,39 +2943,39 @@
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.4.24",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.24.tgz",
-            "integrity": "sha512-vbW/tgbwJYj62N/Ww99x0zhFTkZDTcGh3uwJEuadZ/nF9/xuFMC4693P9r+3sxGXISABpDKvffY5ApH9pmdd1A==",
+            "version": "3.4.25",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.25.tgz",
+            "integrity": "sha512-Y2pLLopaElgWnMNolgG8w3C5nNUVev80L7hdQ5iIKPtMJvhVpG0zhnBG/g3UajJmZdvW0fktyZTotEHD1Srhbg==",
             "dev": true,
             "dependencies": {
                 "@babel/parser": "^7.24.4",
-                "@vue/shared": "3.4.24",
+                "@vue/shared": "3.4.25",
                 "entities": "^4.5.0",
                 "estree-walker": "^2.0.2",
                 "source-map-js": "^1.2.0"
             }
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.4.24",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.24.tgz",
-            "integrity": "sha512-4XgABML/4cNndVsQndG6BbGN7+EoisDwi3oXNovqL/4jdNhwvP8/rfRMTb6FxkxIxUUtg6AI1/qZvwfSjxJiWA==",
+            "version": "3.4.25",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.25.tgz",
+            "integrity": "sha512-Ugz5DusW57+HjllAugLci19NsDK+VyjGvmbB2TXaTcSlQxwL++2PETHx/+Qv6qFwNLzSt7HKepPe4DcTE3pBWg==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-core": "3.4.24",
-                "@vue/shared": "3.4.24"
+                "@vue/compiler-core": "3.4.25",
+                "@vue/shared": "3.4.25"
             }
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.4.24",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.24.tgz",
-            "integrity": "sha512-nRAlJUK02FTWfA2nuvNBAqsDZuERGFgxZ8sGH62XgFSvMxO2URblzulExsmj4gFZ8e+VAyDooU9oAoXfEDNxTA==",
+            "version": "3.4.25",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.25.tgz",
+            "integrity": "sha512-m7rryuqzIoQpOBZ18wKyq05IwL6qEpZxFZfRxlNYuIPDqywrXQxgUwLXIvoU72gs6cRdY6wHD0WVZIFE4OEaAQ==",
             "dev": true,
             "dependencies": {
                 "@babel/parser": "^7.24.4",
-                "@vue/compiler-core": "3.4.24",
-                "@vue/compiler-dom": "3.4.24",
-                "@vue/compiler-ssr": "3.4.24",
-                "@vue/shared": "3.4.24",
+                "@vue/compiler-core": "3.4.25",
+                "@vue/compiler-dom": "3.4.25",
+                "@vue/compiler-ssr": "3.4.25",
+                "@vue/shared": "3.4.25",
                 "estree-walker": "^2.0.2",
                 "magic-string": "^0.30.10",
                 "postcss": "^8.4.38",
@@ -2983,13 +2983,13 @@
             }
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.4.24",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.24.tgz",
-            "integrity": "sha512-ZsAtr4fhaUFnVcDqwW3bYCSDwq+9Gk69q2r/7dAHDrOMw41kylaMgOP4zRnn6GIEJkQznKgrMOGPMFnLB52RbQ==",
+            "version": "3.4.25",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.25.tgz",
+            "integrity": "sha512-H2ohvM/Pf6LelGxDBnfbbXFPyM4NE3hrw0e/EpwuSiYu8c819wx+SVGdJ65p/sFrYDd6OnSDxN1MB2mN07hRSQ==",
             "dev": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.4.24",
-                "@vue/shared": "3.4.24"
+                "@vue/compiler-dom": "3.4.25",
+                "@vue/shared": "3.4.25"
             }
         },
         "node_modules/@vue/component-compiler-utils": {
@@ -3064,9 +3064,9 @@
             "integrity": "sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA=="
         },
         "node_modules/@vue/shared": {
-            "version": "3.4.24",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.24.tgz",
-            "integrity": "sha512-BW4tajrJBM9AGAknnyEw5tO2xTmnqgup0VTnDAMcxYmqOX0RG0b9aSUGAbEKolD91tdwpA6oCwbltoJoNzpItw==",
+            "version": "3.4.25",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.25.tgz",
+            "integrity": "sha512-k0yappJ77g2+KNrIaF0FFnzwLvUBLUYr8VOwz+/6vLsmItFp51AcxLL7Ey3iPd7BIRyWPOcqUjMnm7OkahXllA==",
             "dev": true
         },
         "node_modules/@webassemblyjs/ast": {
@@ -3373,9 +3373,9 @@
             }
         },
         "node_modules/alpinejs": {
-            "version": "3.13.9",
-            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.9.tgz",
-            "integrity": "sha512-BTEJ3fcUpqKlB+aFYSWGVEp8IP3vA96x7wUaNSdb5SJxV5i7s+/Bduxy9D6TokcqpW5MygsnG1eBEFfr4AnQSw==",
+            "version": "3.13.10",
+            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.10.tgz",
+            "integrity": "sha512-86RB307VWICex0vG15Eq0x058cNNsvS57ohrjN6n/TJAVSFV+zXOK/E34nNHDHc6Poq+yTNCLqEzPqEkRBTMRQ==",
             "dependencies": {
                 "@vue/reactivity": "~3.1.1"
             }
@@ -4020,9 +4020,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001612",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001612.tgz",
-            "integrity": "sha512-lFgnZ07UhaCcsSZgWW0K5j4e69dK1u/ltrL9lTUiFOwNHs12S3UMIEYgBV0Z6C6hRDev7iRnMzzYmKabYdXF9g==",
+            "version": "1.0.30001614",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001614.tgz",
+            "integrity": "sha512-jmZQ1VpmlRwHgdP1/uiKzgiAuGOfLEJsYFP4+GBou/QQ4U6IOJCB4NP1c+1p9RGLpwObcT94jA5/uO+F1vBbog==",
             "dev": true,
             "funding": [
                 {
@@ -4085,9 +4085,9 @@
             }
         },
         "node_modules/chartjs-chart-sankey": {
-            "version": "0.12.0",
-            "resolved": "https://registry.npmjs.org/chartjs-chart-sankey/-/chartjs-chart-sankey-0.12.0.tgz",
-            "integrity": "sha512-2f0YfDWNTTDqztVALlD2YMdSbpmjxdxHpcpKgBi9cUq3IPWBvHb58h4gIa7GjsYVjMLwX6gusDXgxlh9PMKkkA==",
+            "version": "0.12.1",
+            "resolved": "https://registry.npmjs.org/chartjs-chart-sankey/-/chartjs-chart-sankey-0.12.1.tgz",
+            "integrity": "sha512-OhrNTEpzEoYaoBW4dp136mnhB9Gf52bKVzqCY41RpH4vvRo04haCsDVYDnHFNWJkBDaKYXd+fzBnVlspU0ZuEw==",
             "peerDependencies": {
                 "chart.js": ">=3.3.0"
             }
@@ -5095,9 +5095,9 @@
             "dev": true
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.746",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.746.tgz",
-            "integrity": "sha512-jeWaIta2rIG2FzHaYIhSuVWqC6KJYo7oSBX4Jv7g+aVujKztfvdpf+n6MGwZdC5hQXbax4nntykLH2juIQrfPg==",
+            "version": "1.4.750",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.750.tgz",
+            "integrity": "sha512-9ItEpeu15hW5m8jKdriL+BQrgwDTXEL9pn4SkillWFu73ZNNNQ2BKKLS+ZHv2vC9UkNhosAeyfxOf/5OSeTCPA==",
             "dev": true
         },
         "node_modules/elliptic": {
@@ -5213,9 +5213,9 @@
             }
         },
         "node_modules/es-module-lexer": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.0.tgz",
-            "integrity": "sha512-pqrTKmwEIgafsYZAGw9kszYzmagcE/n4dbgwGWLEXg7J4QFJVQRBld8j3Q3GNez79jzxZshq0bcT962QHOghjw==",
+            "version": "1.5.2",
+            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.2.tgz",
+            "integrity": "sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA==",
             "dev": true
         },
         "node_modules/esbuild": {
@@ -7858,9 +7858,9 @@
             }
         },
         "node_modules/patch-package/node_modules/yaml": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.1.tgz",
-            "integrity": "sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==",
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.2.tgz",
+            "integrity": "sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==",
             "dev": true,
             "bin": {
                 "yaml": "bin.mjs"
@@ -8991,9 +8991,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.16.2",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.16.2.tgz",
-            "integrity": "sha512-sxDP0+pya/Yi5ZtptF4p3avI+uWCIf/OdrfdH2Gbv1kWddLKk0U7WE3PmQokhi5JrektxsK3sK8s4hzAmjqahw==",
+            "version": "4.17.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.17.0.tgz",
+            "integrity": "sha512-wZJSn0WMtWrxhYKQRt5Z6GIXlziOoMDFmbHmRfL3v+sBTAshx2DBq1AfMArB7eIjF63r4ocn2ZTAyUptg/7kmQ==",
             "dev": true,
             "dependencies": {
                 "@types/estree": "1.0.5"
@@ -9006,22 +9006,22 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.16.2",
-                "@rollup/rollup-android-arm64": "4.16.2",
-                "@rollup/rollup-darwin-arm64": "4.16.2",
-                "@rollup/rollup-darwin-x64": "4.16.2",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.16.2",
-                "@rollup/rollup-linux-arm-musleabihf": "4.16.2",
-                "@rollup/rollup-linux-arm64-gnu": "4.16.2",
-                "@rollup/rollup-linux-arm64-musl": "4.16.2",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.16.2",
-                "@rollup/rollup-linux-riscv64-gnu": "4.16.2",
-                "@rollup/rollup-linux-s390x-gnu": "4.16.2",
-                "@rollup/rollup-linux-x64-gnu": "4.16.2",
-                "@rollup/rollup-linux-x64-musl": "4.16.2",
-                "@rollup/rollup-win32-arm64-msvc": "4.16.2",
-                "@rollup/rollup-win32-ia32-msvc": "4.16.2",
-                "@rollup/rollup-win32-x64-msvc": "4.16.2",
+                "@rollup/rollup-android-arm-eabi": "4.17.0",
+                "@rollup/rollup-android-arm64": "4.17.0",
+                "@rollup/rollup-darwin-arm64": "4.17.0",
+                "@rollup/rollup-darwin-x64": "4.17.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.17.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.17.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.17.0",
+                "@rollup/rollup-linux-arm64-musl": "4.17.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.17.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.17.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.17.0",
+                "@rollup/rollup-linux-x64-gnu": "4.17.0",
+                "@rollup/rollup-linux-x64-musl": "4.17.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.17.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.17.0",
+                "@rollup/rollup-win32-x64-msvc": "4.17.0",
                 "fsevents": "~2.3.2"
             }
         },
@@ -10828,9 +10828,9 @@
             "dev": true
         },
         "node_modules/ws": {
-            "version": "8.16.0",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
-            "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
+            "version": "8.17.0",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
+            "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
             "dev": true,
             "engines": {
                 "node": ">=10.0.0"
@@ -10946,7 +10946,7 @@
                 "bootstrap5-tags": "^1.6.15",
                 "chart.js": "^4.4.0",
                 "chartjs-adapter-date-fns": "^3.0.0",
-                "chartjs-chart-sankey": "^0.12.0",
+                "chartjs-chart-sankey": "^0.12.1",
                 "date-fns": "^3.6.0",
                 "i18next": "^23.11.2",
                 "i18next-chained-backend": "^4.6.2",

public/v2/i18n/bg.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "\u0414\u044a\u043b\u0436\u0430 \u0434\u044a\u043b\u0433",
+        "liability_direction_credit_short": "\u0414\u044a\u043b\u0436\u044a\u0442 \u043c\u0438 \u0434\u044a\u043b\u0433",
+        "interest_calc_yearly": "\u0413\u043e\u0434\u0438\u0448\u043d\u043e",
+        "interest_calc_": "\u043d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430",
+        "interest_calc_daily": "\u041d\u0430 \u0434\u0435\u043d",
+        "interest_calc_monthly": "\u041d\u0430 \u043c\u0435\u0441\u0435\u0446",
+        "interest_calc_weekly": "\u0421\u0435\u0434\u043c\u0438\u0447\u043d\u043e",
+        "interest_calc_half-year": "\u0417\u0430 \u043f\u043e\u043b\u043e\u0432\u0438\u043d \u0433\u043e\u0434\u0438\u043d\u0430",
+        "interest_calc_quarterly": "\u0417\u0430 \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
         "spent": "\u041f\u043e\u0445\u0430\u0440\u0447\u0435\u043d\u0438",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/bg_BG.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "\u0414\u044a\u043b\u0436\u0430 \u0434\u044a\u043b\u0433",
+        "liability_direction_credit_short": "\u0414\u044a\u043b\u0436\u044a\u0442 \u043c\u0438 \u0434\u044a\u043b\u0433",
+        "interest_calc_yearly": "\u0413\u043e\u0434\u0438\u0448\u043d\u043e",
+        "interest_calc_": "\u043d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430",
+        "interest_calc_daily": "\u041d\u0430 \u0434\u0435\u043d",
+        "interest_calc_monthly": "\u041d\u0430 \u043c\u0435\u0441\u0435\u0446",
+        "interest_calc_weekly": "\u0421\u0435\u0434\u043c\u0438\u0447\u043d\u043e",
+        "interest_calc_half-year": "\u0417\u0430 \u043f\u043e\u043b\u043e\u0432\u0438\u043d \u0433\u043e\u0434\u0438\u043d\u0430",
+        "interest_calc_quarterly": "\u0417\u0430 \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
         "spent": "\u041f\u043e\u0445\u0430\u0440\u0447\u0435\u043d\u0438",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/ca.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III no pot determinar el tipus de transacci\u00f3 a partir d'aquest compte de dest\u00ed."
     },
     "firefly": {
+        "liability_direction_debit_short": "Ho dec",
+        "liability_direction_credit_short": "Se'm deu",
+        "interest_calc_yearly": "Per any",
+        "interest_calc_": "desconegut",
+        "interest_calc_daily": "Per dia",
+        "interest_calc_monthly": "Per mes",
+        "interest_calc_weekly": "Per setmana",
+        "interest_calc_half-year": "Cada mig any",
+        "interest_calc_quarterly": "Per quadrimestre",
         "spent": "Gastat",
         "administration_owner": "Propietari de l'administraci\u00f3: {{email}}",
         "administration_you": "El teu rol: {{role}}",

public/v2/i18n/ca_ES.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III no pot determinar el tipus de transacci\u00f3 a partir d'aquest compte de dest\u00ed."
     },
     "firefly": {
+        "liability_direction_debit_short": "Ho dec",
+        "liability_direction_credit_short": "Se'm deu",
+        "interest_calc_yearly": "Per any",
+        "interest_calc_": "desconegut",
+        "interest_calc_daily": "Per dia",
+        "interest_calc_monthly": "Per mes",
+        "interest_calc_weekly": "Per setmana",
+        "interest_calc_half-year": "Cada mig any",
+        "interest_calc_quarterly": "Per quadrimestre",
         "spent": "Gastat",
         "administration_owner": "Propietari de l'administraci\u00f3: {{email}}",
         "administration_you": "El teu rol: {{role}}",

public/v2/i18n/cs.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "Za rok",
+        "interest_calc_": "nezn\u00e1m\u00e9",
+        "interest_calc_daily": "Za den",
+        "interest_calc_monthly": "Za m\u011bs\u00edc",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "Utraceno",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/cs_CZ.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "Za rok",
+        "interest_calc_": "nezn\u00e1m\u00e9",
+        "interest_calc_daily": "Za den",
+        "interest_calc_monthly": "Za m\u011bs\u00edc",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "Utraceno",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/da.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III kan ikke bestemme transaktionstypen baseret p\u00e5 denne destinationskonto."
     },
     "firefly": {
+        "liability_direction_debit_short": "Ejer denne g\u00e6ld",
+        "liability_direction_credit_short": "Ejer denne g\u00e6ld",
+        "interest_calc_yearly": "Pr. \u00e5r",
+        "interest_calc_": "ukendt",
+        "interest_calc_daily": "Pr. dag",
+        "interest_calc_monthly": "Pr. m\u00e5ned",
+        "interest_calc_weekly": "Pr. uge",
+        "interest_calc_half-year": "Hvert halve \u00e5r",
+        "interest_calc_quarterly": "Pr. kvartal",
         "spent": "Spent",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/da_DK.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III kan ikke bestemme transaktionstypen baseret p\u00e5 denne destinationskonto."
     },
     "firefly": {
+        "liability_direction_debit_short": "Ejer denne g\u00e6ld",
+        "liability_direction_credit_short": "Ejer denne g\u00e6ld",
+        "interest_calc_yearly": "Pr. \u00e5r",
+        "interest_calc_": "ukendt",
+        "interest_calc_daily": "Pr. dag",
+        "interest_calc_monthly": "Pr. m\u00e5ned",
+        "interest_calc_weekly": "Pr. uge",
+        "interest_calc_half-year": "Hvert halve \u00e5r",
+        "interest_calc_quarterly": "Pr. kvartal",
         "spent": "Spent",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/de.json

@@ -10,31 +10,40 @@
         "title": "Titel"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "Ziehen und Ablegen",
         "active": "Aktiv?",
         "name": "Name",
         "type": "Typ",
-        "number": "Account number",
+        "number": "Kontonummer",
         "liability_type": "Verbindlichkeitsart",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
-        "menu": "Menu"
+        "current_balance": "Aktueller Kontostand",
+        "last_activity": "Letzte Aktivit\u00e4t",
+        "amount_due": "F\u00e4lliger Betrag",
+        "balance_difference": "Saldendifferenz",
+        "menu": "Men\u00fc"
     },
     "validation": {
         "bad_type_source": "Firefly III kann die Buchungsart anhand dieses Quellkontos nicht ermitteln.",
         "bad_type_destination": "Firefly III kann die Buchungsart anhand dieses Zielkontos nicht ermitteln."
     },
     "firefly": {
+        "liability_direction_debit_short": "Schuldiger Betrag",
+        "liability_direction_credit_short": "Geschuldeter Betrag",
+        "interest_calc_yearly": "J\u00e4hrlich",
+        "interest_calc_": "Unbekannt",
+        "interest_calc_daily": "T\u00e4glich",
+        "interest_calc_monthly": "Monatlich",
+        "interest_calc_weekly": "Pro Woche",
+        "interest_calc_half-year": "Halbj\u00e4hrlich",
+        "interest_calc_quarterly": "Viertelj\u00e4hrlich",
         "spent": "Ausgegeben",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Ihre Funktion: {{role}}",
-        "administration_role_owner": "Owner",
+        "administration_role_owner": "Inhaber",
         "administration_role_ro": "Schreibgesch\u00fctzt",
         "administration_role_mng_trx": "Buchungen verwalten",
         "administration_role_mng_meta": "Klassifizierungs- und Metadaten verwalten",
-        "administration_role_mng_budgets": "Manage budgets",
+        "administration_role_mng_budgets": "Budgets verwalten",
         "administration_role_mng_piggies": "Sparschweine verwalten",
         "administration_role_mng_subscriptions": "Abonnements verwalten",
         "administration_role_mng_rules": "Regeln verwalten",

public/v2/i18n/de_DE.json

@@ -10,31 +10,40 @@
         "title": "Titel"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "Ziehen und Ablegen",
         "active": "Aktiv?",
         "name": "Name",
         "type": "Typ",
-        "number": "Account number",
+        "number": "Kontonummer",
         "liability_type": "Verbindlichkeitsart",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
-        "menu": "Menu"
+        "current_balance": "Aktueller Kontostand",
+        "last_activity": "Letzte Aktivit\u00e4t",
+        "amount_due": "F\u00e4lliger Betrag",
+        "balance_difference": "Saldendifferenz",
+        "menu": "Men\u00fc"
     },
     "validation": {
         "bad_type_source": "Firefly III kann die Buchungsart anhand dieses Quellkontos nicht ermitteln.",
         "bad_type_destination": "Firefly III kann die Buchungsart anhand dieses Zielkontos nicht ermitteln."
     },
     "firefly": {
+        "liability_direction_debit_short": "Schuldiger Betrag",
+        "liability_direction_credit_short": "Geschuldeter Betrag",
+        "interest_calc_yearly": "J\u00e4hrlich",
+        "interest_calc_": "Unbekannt",
+        "interest_calc_daily": "T\u00e4glich",
+        "interest_calc_monthly": "Monatlich",
+        "interest_calc_weekly": "Pro Woche",
+        "interest_calc_half-year": "Halbj\u00e4hrlich",
+        "interest_calc_quarterly": "Viertelj\u00e4hrlich",
         "spent": "Ausgegeben",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Ihre Funktion: {{role}}",
-        "administration_role_owner": "Owner",
+        "administration_role_owner": "Inhaber",
         "administration_role_ro": "Schreibgesch\u00fctzt",
         "administration_role_mng_trx": "Buchungen verwalten",
         "administration_role_mng_meta": "Klassifizierungs- und Metadaten verwalten",
-        "administration_role_mng_budgets": "Manage budgets",
+        "administration_role_mng_budgets": "Budgets verwalten",
         "administration_role_mng_piggies": "Sparschweine verwalten",
         "administration_role_mng_subscriptions": "Abonnements verwalten",
         "administration_role_mng_rules": "Regeln verwalten",

public/v2/i18n/el.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "\u03a4\u03bf Firefly III \u03b4\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03ba\u03b1\u03b8\u03bf\u03c1\u03af\u03c3\u03b5\u03b9 \u03c4\u03bf\u03bd \u03c4\u03cd\u03c0\u03bf \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2 \u03bc\u03b5 \u03b2\u03ac\u03c3\u03b7 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc \u03c0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03bf\u03cd."
     },
     "firefly": {
+        "liability_direction_debit_short": "\u039f\u03c6\u03b5\u03af\u03bb\u03c9 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03c7\u03c1\u03ad\u03bf\u03c2",
+        "liability_direction_credit_short": "\u039c\u03bf\u03c5 \u03bf\u03c6\u03b5\u03af\u03bb\u03bf\u03c5\u03bd \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03c7\u03c1\u03ad\u03bf\u03c2",
+        "interest_calc_yearly": "\u0391\u03bd\u03ac \u03ad\u03c4\u03bf\u03c2",
+        "interest_calc_": "\u03ac\u03b3\u03bd\u03c9\u03c3\u03c4\u03bf",
+        "interest_calc_daily": "\u0391\u03bd\u03ac \u03b7\u03bc\u03ad\u03c1\u03b1",
+        "interest_calc_monthly": "\u0391\u03bd\u03ac \u03bc\u03ae\u03bd\u03b1",
+        "interest_calc_weekly": "\u0391\u03bd\u03ac \u03b5\u03b2\u03b4\u03bf\u03bc\u03ac\u03b4\u03b1",
+        "interest_calc_half-year": "\u0391\u03bd\u03ac \u03b5\u03be\u03ac\u03bc\u03b7\u03bd\u03bf",
+        "interest_calc_quarterly": "\u0391\u03bd\u03ac \u03c4\u03c1\u03af\u03bc\u03b7\u03bd\u03bf",
         "spent": "\u0394\u03b1\u03c0\u03b1\u03bd\u03ae\u03b8\u03b7\u03ba\u03b1\u03bd",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/el_GR.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "\u03a4\u03bf Firefly III \u03b4\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03ba\u03b1\u03b8\u03bf\u03c1\u03af\u03c3\u03b5\u03b9 \u03c4\u03bf\u03bd \u03c4\u03cd\u03c0\u03bf \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2 \u03bc\u03b5 \u03b2\u03ac\u03c3\u03b7 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc \u03c0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03bf\u03cd."
     },
     "firefly": {
+        "liability_direction_debit_short": "\u039f\u03c6\u03b5\u03af\u03bb\u03c9 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03c7\u03c1\u03ad\u03bf\u03c2",
+        "liability_direction_credit_short": "\u039c\u03bf\u03c5 \u03bf\u03c6\u03b5\u03af\u03bb\u03bf\u03c5\u03bd \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03c7\u03c1\u03ad\u03bf\u03c2",
+        "interest_calc_yearly": "\u0391\u03bd\u03ac \u03ad\u03c4\u03bf\u03c2",
+        "interest_calc_": "\u03ac\u03b3\u03bd\u03c9\u03c3\u03c4\u03bf",
+        "interest_calc_daily": "\u0391\u03bd\u03ac \u03b7\u03bc\u03ad\u03c1\u03b1",
+        "interest_calc_monthly": "\u0391\u03bd\u03ac \u03bc\u03ae\u03bd\u03b1",
+        "interest_calc_weekly": "\u0391\u03bd\u03ac \u03b5\u03b2\u03b4\u03bf\u03bc\u03ac\u03b4\u03b1",
+        "interest_calc_half-year": "\u0391\u03bd\u03ac \u03b5\u03be\u03ac\u03bc\u03b7\u03bd\u03bf",
+        "interest_calc_quarterly": "\u0391\u03bd\u03ac \u03c4\u03c1\u03af\u03bc\u03b7\u03bd\u03bf",
         "spent": "\u0394\u03b1\u03c0\u03b1\u03bd\u03ae\u03b8\u03b7\u03ba\u03b1\u03bd",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/en-gb.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "Per year",
+        "interest_calc_": "unknown",
+        "interest_calc_daily": "Per day",
+        "interest_calc_monthly": "Per month",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "Spent",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/en.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "Per year",
+        "interest_calc_": "unknown",
+        "interest_calc_daily": "Per day",
+        "interest_calc_monthly": "Per month",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "Spent",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/en_GB.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "Per year",
+        "interest_calc_": "unknown",
+        "interest_calc_daily": "Per day",
+        "interest_calc_monthly": "Per month",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "Spent",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/en_US.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "Per year",
+        "interest_calc_": "unknown",
+        "interest_calc_daily": "Per day",
+        "interest_calc_monthly": "Per month",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "Spent",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/es.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III no puede determinar el tipo de transacci\u00f3n basado en esta cuenta de destino."
     },
     "firefly": {
+        "liability_direction_debit_short": "Tiene esta deuda",
+        "liability_direction_credit_short": "Ten\u00eda esta deuda",
+        "interest_calc_yearly": "Por a\u00f1o",
+        "interest_calc_": "desconocido",
+        "interest_calc_daily": "Por dia",
+        "interest_calc_monthly": "Por mes",
+        "interest_calc_weekly": "Por semana",
+        "interest_calc_half-year": "Por semestre",
+        "interest_calc_quarterly": "Por trimestre",
         "spent": "Gastado",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/es_ES.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III no puede determinar el tipo de transacci\u00f3n basado en esta cuenta de destino."
     },
     "firefly": {
+        "liability_direction_debit_short": "Tiene esta deuda",
+        "liability_direction_credit_short": "Ten\u00eda esta deuda",
+        "interest_calc_yearly": "Por a\u00f1o",
+        "interest_calc_": "desconocido",
+        "interest_calc_daily": "Por dia",
+        "interest_calc_monthly": "Por mes",
+        "interest_calc_weekly": "Por semana",
+        "interest_calc_half-year": "Por semestre",
+        "interest_calc_quarterly": "Por trimestre",
         "spent": "Gastado",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/fi.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Olen velkaa",
+        "liability_direction_credit_short": "Minulle ollaan velkaa",
+        "interest_calc_yearly": "Vuodessa",
+        "interest_calc_": "tuntematon",
+        "interest_calc_daily": "P\u00e4iv\u00e4ss\u00e4",
+        "interest_calc_monthly": "Kuukaudessa",
+        "interest_calc_weekly": "Viikossa",
+        "interest_calc_half-year": "Puolessa vuodessa",
+        "interest_calc_quarterly": "Nelj\u00e4nnest\u00e4 kohden",
         "spent": "K\u00e4ytetty",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/fi_FI.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Olen velkaa",
+        "liability_direction_credit_short": "Minulle ollaan velkaa",
+        "interest_calc_yearly": "Vuodessa",
+        "interest_calc_": "tuntematon",
+        "interest_calc_daily": "P\u00e4iv\u00e4ss\u00e4",
+        "interest_calc_monthly": "Kuukaudessa",
+        "interest_calc_weekly": "Viikossa",
+        "interest_calc_half-year": "Puolessa vuodessa",
+        "interest_calc_quarterly": "Nelj\u00e4nnest\u00e4 kohden",
         "spent": "K\u00e4ytetty",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/fr.json

@@ -10,16 +10,16 @@
         "title": "Titre"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "Glisser-d\u00e9poser",
         "active": "Actif ?",
         "name": "Nom",
         "type": "Type",
-        "number": "Account number",
+        "number": "N\u00b0 de compte",
         "liability_type": "Type de passif",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
+        "current_balance": "Solde actuel",
+        "last_activity": "Activit\u00e9 r\u00e9cente",
+        "amount_due": "Montant d\u00fb",
+        "balance_difference": "Diff\u00e9rence de solde",
         "menu": "Menu"
     },
     "validation": {
@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III ne peut pas d\u00e9terminer le type de transaction bas\u00e9 sur ce compte de destination."
     },
     "firefly": {
+        "liability_direction_debit_short": "Pr\u00eateur",
+        "liability_direction_credit_short": "Emprunteur",
+        "interest_calc_yearly": "Par an",
+        "interest_calc_": "inconnu",
+        "interest_calc_daily": "Par jour",
+        "interest_calc_monthly": "Par mois",
+        "interest_calc_weekly": "Par semaine",
+        "interest_calc_half-year": "Par semestre",
+        "interest_calc_quarterly": "Par trimestre",
         "spent": "D\u00e9pens\u00e9",
         "administration_owner": "Propri\u00e9taire de l'administration : {{email}}",
         "administration_you": "Votre r\u00f4le : {{role}}",

public/v2/i18n/fr_FR.json

@@ -10,16 +10,16 @@
         "title": "Titre"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "Glisser-d\u00e9poser",
         "active": "Actif ?",
         "name": "Nom",
         "type": "Type",
-        "number": "Account number",
+        "number": "N\u00b0 de compte",
         "liability_type": "Type de passif",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
+        "current_balance": "Solde actuel",
+        "last_activity": "Activit\u00e9 r\u00e9cente",
+        "amount_due": "Montant d\u00fb",
+        "balance_difference": "Diff\u00e9rence de solde",
         "menu": "Menu"
     },
     "validation": {
@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III ne peut pas d\u00e9terminer le type de transaction bas\u00e9 sur ce compte de destination."
     },
     "firefly": {
+        "liability_direction_debit_short": "Pr\u00eateur",
+        "liability_direction_credit_short": "Emprunteur",
+        "interest_calc_yearly": "Par an",
+        "interest_calc_": "inconnu",
+        "interest_calc_daily": "Par jour",
+        "interest_calc_monthly": "Par mois",
+        "interest_calc_weekly": "Par semaine",
+        "interest_calc_half-year": "Par semestre",
+        "interest_calc_quarterly": "Par trimestre",
         "spent": "D\u00e9pens\u00e9",
         "administration_owner": "Propri\u00e9taire de l'administration : {{email}}",
         "administration_you": "Votre r\u00f4le : {{role}}",

public/v2/i18n/hu.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "A Firefly III nem tudja eld\u00f6nteni a tranzakci\u00f3 t\u00edpus\u00e1t a c\u00e9lsz\u00e1mla alapj\u00e1n."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "\u00c9vente",
+        "interest_calc_": "ismeretlen",
+        "interest_calc_daily": "Naponta",
+        "interest_calc_monthly": "Havonta",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "Elk\u00f6lt\u00f6tt",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/hu_HU.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "A Firefly III nem tudja eld\u00f6nteni a tranzakci\u00f3 t\u00edpus\u00e1t a c\u00e9lsz\u00e1mla alapj\u00e1n."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "\u00c9vente",
+        "interest_calc_": "ismeretlen",
+        "interest_calc_daily": "Naponta",
+        "interest_calc_monthly": "Havonta",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "Elk\u00f6lt\u00f6tt",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/id.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "Per year",
+        "interest_calc_": "unknown",
+        "interest_calc_daily": "Per day",
+        "interest_calc_monthly": "Per month",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "Menghabiskan",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/id_ID.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "Per year",
+        "interest_calc_": "unknown",
+        "interest_calc_daily": "Per day",
+        "interest_calc_monthly": "Per month",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "Menghabiskan",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/it.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III non pu\u00f2 determinare il tipo di transazione in base a questo account di destinazione."
     },
     "firefly": {
+        "liability_direction_debit_short": "Devo questo debito",
+        "liability_direction_credit_short": "Mi devono questo debito",
+        "interest_calc_yearly": "All'anno",
+        "interest_calc_": "sconosciuto",
+        "interest_calc_daily": "Al giorno",
+        "interest_calc_monthly": "Al mese",
+        "interest_calc_weekly": "Settimanale",
+        "interest_calc_half-year": "Semestrale",
+        "interest_calc_quarterly": "Trimestrale",
         "spent": "Speso",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/it_IT.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III non pu\u00f2 determinare il tipo di transazione in base a questo account di destinazione."
     },
     "firefly": {
+        "liability_direction_debit_short": "Devo questo debito",
+        "liability_direction_credit_short": "Mi devono questo debito",
+        "interest_calc_yearly": "All'anno",
+        "interest_calc_": "sconosciuto",
+        "interest_calc_daily": "Al giorno",
+        "interest_calc_monthly": "Al mese",
+        "interest_calc_weekly": "Settimanale",
+        "interest_calc_half-year": "Semestrale",
+        "interest_calc_quarterly": "Trimestrale",
         "spent": "Speso",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/ja.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "\u3053\u306e\u8ca0\u50b5\u3092\u8ca0\u3046",
+        "liability_direction_credit_short": "\u3053\u306e\u8ca0\u50b5\u3092\u8ca0\u3063\u3066\u3044\u308b",
+        "interest_calc_yearly": "1\u5e74\u3042\u305f\u308a",
+        "interest_calc_": "\u4e0d\u660e",
+        "interest_calc_daily": "1\u65e5\u3042\u305f\u308a",
+        "interest_calc_monthly": "1\u30f6\u6708\u3042\u305f\u308a",
+        "interest_calc_weekly": "1\u9031\u3042\u305f\u308a",
+        "interest_calc_half-year": "\u534a\u5e74\u3042\u305f\u308a",
+        "interest_calc_quarterly": "\u56db\u534a\u671f\u3042\u305f\u308a",
         "spent": "\u652f\u51fa",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/ja_JP.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "\u3053\u306e\u8ca0\u50b5\u3092\u8ca0\u3046",
+        "liability_direction_credit_short": "\u3053\u306e\u8ca0\u50b5\u3092\u8ca0\u3063\u3066\u3044\u308b",
+        "interest_calc_yearly": "1\u5e74\u3042\u305f\u308a",
+        "interest_calc_": "\u4e0d\u660e",
+        "interest_calc_daily": "1\u65e5\u3042\u305f\u308a",
+        "interest_calc_monthly": "1\u30f6\u6708\u3042\u305f\u308a",
+        "interest_calc_weekly": "1\u9031\u3042\u305f\u308a",
+        "interest_calc_half-year": "\u534a\u5e74\u3042\u305f\u308a",
+        "interest_calc_quarterly": "\u56db\u534a\u671f\u3042\u305f\u308a",
         "spent": "\u652f\u51fa",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/ko.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "\uc774 \ube5a\uc744 \uc9c0\uace0 \uc788\uc2b5\ub2c8\ub2e4",
+        "liability_direction_credit_short": "\uc774 \ube5a\uc744 \uc9c0\uace0 \uc788\uc2b5\ub2c8\ub2e4",
+        "interest_calc_yearly": "\uc5f0\uac04",
+        "interest_calc_": "\uc54c \uc218 \uc5c6\uc74c",
+        "interest_calc_daily": "\uc77c\ubcc4",
+        "interest_calc_monthly": "\uc6d4\ubcc4",
+        "interest_calc_weekly": "\uc8fc\ub2f9",
+        "interest_calc_half-year": "\ubc18\uae30\ub2f9",
+        "interest_calc_quarterly": "\ubd84\uae30\ub2f9",
         "spent": "\uc9c0\ucd9c",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/ko_KR.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "\uc774 \ube5a\uc744 \uc9c0\uace0 \uc788\uc2b5\ub2c8\ub2e4",
+        "liability_direction_credit_short": "\uc774 \ube5a\uc744 \uc9c0\uace0 \uc788\uc2b5\ub2c8\ub2e4",
+        "interest_calc_yearly": "\uc5f0\uac04",
+        "interest_calc_": "\uc54c \uc218 \uc5c6\uc74c",
+        "interest_calc_daily": "\uc77c\ubcc4",
+        "interest_calc_monthly": "\uc6d4\ubcc4",
+        "interest_calc_weekly": "\uc8fc\ub2f9",
+        "interest_calc_half-year": "\ubc18\uae30\ub2f9",
+        "interest_calc_quarterly": "\ubd84\uae30\ub2f9",
         "spent": "\uc9c0\ucd9c",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/nb.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Skylder denne gjelden",
+        "liability_direction_credit_short": "Jeg skuldet denne gjelden",
+        "interest_calc_yearly": "Per \u00e5r",
+        "interest_calc_": "ukjent",
+        "interest_calc_daily": "Per dag",
+        "interest_calc_monthly": "Per m\u00e5ned",
+        "interest_calc_weekly": "Per uke",
+        "interest_calc_half-year": "Per halv\u00e5r",
+        "interest_calc_quarterly": "Per kvartal",
         "spent": "Brukt",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/nb_NO.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Skylder denne gjelden",
+        "liability_direction_credit_short": "Jeg skuldet denne gjelden",
+        "interest_calc_yearly": "Per \u00e5r",
+        "interest_calc_": "ukjent",
+        "interest_calc_daily": "Per dag",
+        "interest_calc_monthly": "Per m\u00e5ned",
+        "interest_calc_weekly": "Per uke",
+        "interest_calc_half-year": "Per halv\u00e5r",
+        "interest_calc_quarterly": "Per kvartal",
         "spent": "Brukt",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/nl.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III kan het transactietype niet bepalen op basis van deze doelrekening."
     },
     "firefly": {
+        "liability_direction_debit_short": "Schuldenaar",
+        "liability_direction_credit_short": "Schuldeiser",
+        "interest_calc_yearly": "Per jaar",
+        "interest_calc_": "onbekend",
+        "interest_calc_daily": "Per dag",
+        "interest_calc_monthly": "Per maand",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half jaar",
+        "interest_calc_quarterly": "Per kwartaal",
         "spent": "Uitgegeven",
         "administration_owner": "Grootboekeigenaar: {{email}}",
         "administration_you": "Jouw rol: {{role}}",

public/v2/i18n/nl_NL.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III kan het transactietype niet bepalen op basis van deze doelrekening."
     },
     "firefly": {
+        "liability_direction_debit_short": "Schuldenaar",
+        "liability_direction_credit_short": "Schuldeiser",
+        "interest_calc_yearly": "Per jaar",
+        "interest_calc_": "onbekend",
+        "interest_calc_daily": "Per dag",
+        "interest_calc_monthly": "Per maand",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half jaar",
+        "interest_calc_quarterly": "Per kwartaal",
         "spent": "Uitgegeven",
         "administration_owner": "Grootboekeigenaar: {{email}}",
         "administration_you": "Jouw rol: {{role}}",

public/v2/i18n/nn.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Jeg skuldet denne gjelda",
+        "interest_calc_yearly": "Per \u00e5r",
+        "interest_calc_": "ukjent",
+        "interest_calc_daily": "Per dag",
+        "interest_calc_monthly": "Per m\u00e5nad",
+        "interest_calc_weekly": "Per veke",
+        "interest_calc_half-year": "Per halv\u00e5r",
+        "interest_calc_quarterly": "Per kvartal",
         "spent": "Brukt",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/nn_NO.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Jeg skuldet denne gjelda",
+        "interest_calc_yearly": "Per \u00e5r",
+        "interest_calc_": "ukjent",
+        "interest_calc_daily": "Per dag",
+        "interest_calc_monthly": "Per m\u00e5nad",
+        "interest_calc_weekly": "Per veke",
+        "interest_calc_half-year": "Per halv\u00e5r",
+        "interest_calc_quarterly": "Per kvartal",
         "spent": "Brukt",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/pl.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Jeste\u015b d\u0142u\u017cny",
+        "liability_direction_credit_short": "D\u0142ug wobec Ciebie",
+        "interest_calc_yearly": "Co rok",
+        "interest_calc_": "nieznany",
+        "interest_calc_daily": "Co dzie\u0144",
+        "interest_calc_monthly": "Co miesi\u0105c",
+        "interest_calc_weekly": "Tygodniowo",
+        "interest_calc_half-year": "Co p\u00f3\u0142 roku",
+        "interest_calc_quarterly": "Kwartalnie",
         "spent": "Wydano",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/pl_PL.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Jeste\u015b d\u0142u\u017cny",
+        "liability_direction_credit_short": "D\u0142ug wobec Ciebie",
+        "interest_calc_yearly": "Co rok",
+        "interest_calc_": "nieznany",
+        "interest_calc_daily": "Co dzie\u0144",
+        "interest_calc_monthly": "Co miesi\u0105c",
+        "interest_calc_weekly": "Tygodniowo",
+        "interest_calc_half-year": "Co p\u00f3\u0142 roku",
+        "interest_calc_quarterly": "Kwartalnie",
         "spent": "Wydano",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/pt-br.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III n\u00e3o conseguiu determinar o tipo de transa\u00e7\u00e3o baseado nesta conta destino."
     },
     "firefly": {
+        "liability_direction_debit_short": "Devo essa d\u00edvida",
+        "liability_direction_credit_short": "Devo receber essa d\u00edvida",
+        "interest_calc_yearly": "Por ano",
+        "interest_calc_": "desconhecido",
+        "interest_calc_daily": "Por dia",
+        "interest_calc_monthly": "Por m\u00eas",
+        "interest_calc_weekly": "Por semana",
+        "interest_calc_half-year": "Por semestre",
+        "interest_calc_quarterly": "Por trimestre",
         "spent": "Gasto",
         "administration_owner": "Propriet\u00e1rio da administra\u00e7\u00e3o: {{email}}",
         "administration_you": "Sua fun\u00e7\u00e3o: {{role}}",

public/v2/i18n/pt.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "O Firefly III n\u00e3o consegue determinar o tipo de transa\u00e7\u00e3o baseado nesta conta de destino."
     },
     "firefly": {
+        "liability_direction_debit_short": "Devo esta d\u00edvida",
+        "liability_direction_credit_short": "Devem-me esta d\u00edvida",
+        "interest_calc_yearly": "Por ano",
+        "interest_calc_": "desconhecido",
+        "interest_calc_daily": "Por dia",
+        "interest_calc_monthly": "Por m\u00eas",
+        "interest_calc_weekly": "Por semana",
+        "interest_calc_half-year": "Por semestre",
+        "interest_calc_quarterly": "Por trimestre",
         "spent": "Gasto",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/pt_BR.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III n\u00e3o conseguiu determinar o tipo de transa\u00e7\u00e3o baseado nesta conta destino."
     },
     "firefly": {
+        "liability_direction_debit_short": "Devo essa d\u00edvida",
+        "liability_direction_credit_short": "Devo receber essa d\u00edvida",
+        "interest_calc_yearly": "Por ano",
+        "interest_calc_": "desconhecido",
+        "interest_calc_daily": "Por dia",
+        "interest_calc_monthly": "Por m\u00eas",
+        "interest_calc_weekly": "Por semana",
+        "interest_calc_half-year": "Por semestre",
+        "interest_calc_quarterly": "Por trimestre",
         "spent": "Gasto",
         "administration_owner": "Propriet\u00e1rio da administra\u00e7\u00e3o: {{email}}",
         "administration_you": "Sua fun\u00e7\u00e3o: {{role}}",

public/v2/i18n/pt_PT.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "O Firefly III n\u00e3o consegue determinar o tipo de transa\u00e7\u00e3o baseado nesta conta de destino."
     },
     "firefly": {
+        "liability_direction_debit_short": "Devo esta d\u00edvida",
+        "liability_direction_credit_short": "Devem-me esta d\u00edvida",
+        "interest_calc_yearly": "Por ano",
+        "interest_calc_": "desconhecido",
+        "interest_calc_daily": "Por dia",
+        "interest_calc_monthly": "Por m\u00eas",
+        "interest_calc_weekly": "Por semana",
+        "interest_calc_half-year": "Por semestre",
+        "interest_calc_quarterly": "Por trimestre",
         "spent": "Gasto",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/ro.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III nu poate determina tipul de tranzac\u021bie bazat pe acest cont de destina\u021bie."
     },
     "firefly": {
+        "liability_direction_debit_short": "Creditor",
+        "liability_direction_credit_short": "\u00cendatorat",
+        "interest_calc_yearly": "Pe an",
+        "interest_calc_": "necunoscut",
+        "interest_calc_daily": "Pe zi",
+        "interest_calc_monthly": "Pe lun\u0103",
+        "interest_calc_weekly": "Pe s\u0103pt\u0103m\u00e2n\u0103",
+        "interest_calc_half-year": "Pe jum\u0103tate de an",
+        "interest_calc_quarterly": "Pe trimestru",
         "spent": "Cheltuit",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/ro_RO.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III nu poate determina tipul de tranzac\u021bie bazat pe acest cont de destina\u021bie."
     },
     "firefly": {
+        "liability_direction_debit_short": "Creditor",
+        "liability_direction_credit_short": "\u00cendatorat",
+        "interest_calc_yearly": "Pe an",
+        "interest_calc_": "necunoscut",
+        "interest_calc_daily": "Pe zi",
+        "interest_calc_monthly": "Pe lun\u0103",
+        "interest_calc_weekly": "Pe s\u0103pt\u0103m\u00e2n\u0103",
+        "interest_calc_half-year": "Pe jum\u0103tate de an",
+        "interest_calc_quarterly": "Pe trimestru",
         "spent": "Cheltuit",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/ru.json

@@ -10,23 +10,32 @@
         "title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "\u041f\u0435\u0440\u0435\u0442\u0430\u0441\u043a\u0438\u0432\u0430\u043d\u0438\u0435",
         "active": "\u0410\u043a\u0442\u0438\u0432\u0435\u043d?",
         "name": "\u0418\u043c\u044f",
         "type": "\u0422\u0438\u043f",
-        "number": "Account number",
+        "number": "\u041d\u043e\u043c\u0435\u0440 \u0441\u0447\u0435\u0442\u0430",
         "liability_type": "\u0422\u0438\u043f \u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0441\u0442\u0438",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
-        "menu": "Menu"
+        "current_balance": "\u0422\u0435\u043a\u0443\u0449\u0438\u0439 \u0431\u0430\u043b\u0430\u043d\u0441",
+        "last_activity": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u044c",
+        "amount_due": "\u0421\u0443\u043c\u043c\u0430 \u0434\u043e\u043b\u0433\u0430",
+        "balance_difference": "\u0420\u0430\u0437\u043d\u0438\u0446\u0430 \u0431\u0430\u043b\u0430\u043d\u0441\u0430",
+        "menu": "\u041c\u0435\u043d\u044e"
     },
     "validation": {
         "bad_type_source": "Firefly III \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u044d\u0442\u043e\u0433\u043e \u0438\u0441\u0445\u043e\u0434\u043d\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430.",
         "bad_type_destination": "Firefly III \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u044d\u0442\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430."
     },
     "firefly": {
+        "liability_direction_debit_short": "\u042f \u0434\u043e\u043b\u0436\u0435\u043d",
+        "liability_direction_credit_short": "\u041c\u043d\u0435 \u0434\u043e\u043b\u0436\u043d\u044b",
+        "interest_calc_yearly": "\u0412 \u0433\u043e\u0434",
+        "interest_calc_": "\u043d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u043e",
+        "interest_calc_daily": "\u0412 \u0434\u0435\u043d\u044c",
+        "interest_calc_monthly": "\u0412 \u043c\u0435\u0441\u044f\u0446",
+        "interest_calc_weekly": "\u0417\u0430 \u043d\u0435\u0434\u0435\u043b\u044e",
+        "interest_calc_half-year": "\u0417\u0430 \u043f\u043e\u043b\u0433\u043e\u0434\u0430",
+        "interest_calc_quarterly": "\u0417\u0430 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
         "spent": "\u0420\u0430\u0441\u0445\u043e\u0434",
         "administration_owner": "\u0412\u043b\u0430\u0434\u0435\u043b\u0435\u0446 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f: {{email}}",
         "administration_you": "\u0412\u0430\u0448\u0430 \u0440\u043e\u043b\u044c: {{role}}",

public/v2/i18n/ru_RU.json

@@ -10,23 +10,32 @@
         "title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "\u041f\u0435\u0440\u0435\u0442\u0430\u0441\u043a\u0438\u0432\u0430\u043d\u0438\u0435",
         "active": "\u0410\u043a\u0442\u0438\u0432\u0435\u043d?",
         "name": "\u0418\u043c\u044f",
         "type": "\u0422\u0438\u043f",
-        "number": "Account number",
+        "number": "\u041d\u043e\u043c\u0435\u0440 \u0441\u0447\u0435\u0442\u0430",
         "liability_type": "\u0422\u0438\u043f \u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0441\u0442\u0438",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
-        "menu": "Menu"
+        "current_balance": "\u0422\u0435\u043a\u0443\u0449\u0438\u0439 \u0431\u0430\u043b\u0430\u043d\u0441",
+        "last_activity": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u044c",
+        "amount_due": "\u0421\u0443\u043c\u043c\u0430 \u0434\u043e\u043b\u0433\u0430",
+        "balance_difference": "\u0420\u0430\u0437\u043d\u0438\u0446\u0430 \u0431\u0430\u043b\u0430\u043d\u0441\u0430",
+        "menu": "\u041c\u0435\u043d\u044e"
     },
     "validation": {
         "bad_type_source": "Firefly III \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u044d\u0442\u043e\u0433\u043e \u0438\u0441\u0445\u043e\u0434\u043d\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430.",
         "bad_type_destination": "Firefly III \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u044d\u0442\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430."
     },
     "firefly": {
+        "liability_direction_debit_short": "\u042f \u0434\u043e\u043b\u0436\u0435\u043d",
+        "liability_direction_credit_short": "\u041c\u043d\u0435 \u0434\u043e\u043b\u0436\u043d\u044b",
+        "interest_calc_yearly": "\u0412 \u0433\u043e\u0434",
+        "interest_calc_": "\u043d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u043e",
+        "interest_calc_daily": "\u0412 \u0434\u0435\u043d\u044c",
+        "interest_calc_monthly": "\u0412 \u043c\u0435\u0441\u044f\u0446",
+        "interest_calc_weekly": "\u0417\u0430 \u043d\u0435\u0434\u0435\u043b\u044e",
+        "interest_calc_half-year": "\u0417\u0430 \u043f\u043e\u043b\u0433\u043e\u0434\u0430",
+        "interest_calc_quarterly": "\u0417\u0430 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
         "spent": "\u0420\u0430\u0441\u0445\u043e\u0434",
         "administration_owner": "\u0412\u043b\u0430\u0434\u0435\u043b\u0435\u0446 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f: {{email}}",
         "administration_you": "\u0412\u0430\u0448\u0430 \u0440\u043e\u043b\u044c: {{role}}",

public/v2/i18n/sk.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "Za rok",
+        "interest_calc_": "nezn\u00e1me",
+        "interest_calc_daily": "Za de\u0148",
+        "interest_calc_monthly": "Za mesiac",
+        "interest_calc_weekly": "Za t\u00fd\u017ede\u0148",
+        "interest_calc_half-year": "Za polrok",
+        "interest_calc_quarterly": "Za \u0161tvr\u0165rok",
         "spent": "Utraten\u00e9",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/sk_SK.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "Za rok",
+        "interest_calc_": "nezn\u00e1me",
+        "interest_calc_daily": "Za de\u0148",
+        "interest_calc_monthly": "Za mesiac",
+        "interest_calc_weekly": "Za t\u00fd\u017ede\u0148",
+        "interest_calc_half-year": "Za polrok",
+        "interest_calc_quarterly": "Za \u0161tvr\u0165rok",
         "spent": "Utraten\u00e9",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/sl.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Na podlagi tega ciljnega ra\u010duna Firefly III ne more dolo\u010diti vrste transakcije."
     },
     "firefly": {
+        "liability_direction_debit_short": "Dolgujem",
+        "liability_direction_credit_short": "Ta dolg je bil dolgovan",
+        "interest_calc_yearly": "Na leto",
+        "interest_calc_": "neznano",
+        "interest_calc_daily": "Na dan",
+        "interest_calc_monthly": "Na mesec",
+        "interest_calc_weekly": "Tedensko",
+        "interest_calc_half-year": "Na pol leta",
+        "interest_calc_quarterly": "Na \u010detrtletje",
         "spent": "Porabljeno",
         "administration_owner": "Lastnik administracije: {{email}}",
         "administration_you": "Va\u0161a vloga: {{role}}",

public/v2/i18n/sl_SI.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Na podlagi tega ciljnega ra\u010duna Firefly III ne more dolo\u010diti vrste transakcije."
     },
     "firefly": {
+        "liability_direction_debit_short": "Dolgujem",
+        "liability_direction_credit_short": "Ta dolg je bil dolgovan",
+        "interest_calc_yearly": "Na leto",
+        "interest_calc_": "neznano",
+        "interest_calc_daily": "Na dan",
+        "interest_calc_monthly": "Na mesec",
+        "interest_calc_weekly": "Tedensko",
+        "interest_calc_half-year": "Na pol leta",
+        "interest_calc_quarterly": "Na \u010detrtletje",
         "spent": "Porabljeno",
         "administration_owner": "Lastnik administracije: {{email}}",
         "administration_you": "Va\u0161a vloga: {{role}}",

public/v2/i18n/sv.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "\u00c4ger denna skuld",
+        "liability_direction_credit_short": "\u00c4gde denna skuld",
+        "interest_calc_yearly": "Per \u00e5r",
+        "interest_calc_": "ok\u00e4nd",
+        "interest_calc_daily": "Per dag",
+        "interest_calc_monthly": "Per m\u00e5nad",
+        "interest_calc_weekly": "Per vecka",
+        "interest_calc_half-year": "Per halv\u00e5r",
+        "interest_calc_quarterly": "Per kvartal",
         "spent": "Spenderat",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Din roll: {{role}}",

public/v2/i18n/sv_SE.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "\u00c4ger denna skuld",
+        "liability_direction_credit_short": "\u00c4gde denna skuld",
+        "interest_calc_yearly": "Per \u00e5r",
+        "interest_calc_": "ok\u00e4nd",
+        "interest_calc_daily": "Per dag",
+        "interest_calc_monthly": "Per m\u00e5nad",
+        "interest_calc_weekly": "Per vecka",
+        "interest_calc_half-year": "Per halv\u00e5r",
+        "interest_calc_quarterly": "Per kvartal",
         "spent": "Spenderat",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Din roll: {{role}}",

public/v2/i18n/tr.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "Per year",
+        "interest_calc_": "unknown",
+        "interest_calc_daily": "Per day",
+        "interest_calc_monthly": "Per month",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "Harcanan",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/tr_TR.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "Per year",
+        "interest_calc_": "unknown",
+        "interest_calc_daily": "Per day",
+        "interest_calc_monthly": "Per month",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "Harcanan",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/uk.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "Per year",
+        "interest_calc_": "unknown",
+        "interest_calc_daily": "\u0417\u0430 \u0434\u0435\u043d\u044c",
+        "interest_calc_monthly": "\u0417\u0430 \u043c\u0456\u0441\u044f\u0446\u044c",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "Spent",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/uk_UA.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "Per year",
+        "interest_calc_": "unknown",
+        "interest_calc_daily": "\u0417\u0430 \u0434\u0435\u043d\u044c",
+        "interest_calc_monthly": "\u0417\u0430 \u043c\u0456\u0441\u044f\u0446\u044c",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "Spent",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/vi.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "M\u1ed7i n\u0103m",
+        "interest_calc_": "kh\u00f4ng x\u00e1c \u0111\u1ecbnh",
+        "interest_calc_daily": "M\u1ed7i ng\u00e0y",
+        "interest_calc_monthly": "M\u1ed7i th\u00e1ng",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "\u0110\u00e3 chi",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/vi_VN.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "M\u1ed7i n\u0103m",
+        "interest_calc_": "kh\u00f4ng x\u00e1c \u0111\u1ecbnh",
+        "interest_calc_daily": "M\u1ed7i ng\u00e0y",
+        "interest_calc_monthly": "M\u1ed7i th\u00e1ng",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "\u0110\u00e3 chi",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/zh-cn.json

@@ -10,40 +10,49 @@
         "title": "\u6807\u9898"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "\u62d6\u653e",
         "active": "\u662f\u5426\u542f\u7528\uff1f",
         "name": "\u540d\u79f0",
         "type": "\u7c7b\u578b",
-        "number": "Account number",
+        "number": "\u8d26\u6237\u53f7\u7801",
         "liability_type": "\u503a\u52a1\u7c7b\u578b",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
-        "menu": "Menu"
+        "current_balance": "\u5f53\u524d\u4f59\u989d",
+        "last_activity": "\u6700\u540e\u6d3b\u52a8",
+        "amount_due": "\u5230\u671f\u91d1\u989d",
+        "balance_difference": "\u4f59\u989d\u5dee",
+        "menu": "\u83dc\u5355"
     },
     "validation": {
         "bad_type_source": "Firefly III \u65e0\u6cd5\u786e\u5b9a\u57fa\u4e8e\u6b64\u6e90\u8d26\u6237\u7684\u4ea4\u6613\u7c7b\u578b\u3002",
         "bad_type_destination": "Firefly III \u65e0\u6cd5\u786e\u5b9a\u57fa\u4e8e\u6b64\u76ee\u6807\u5e10\u6237\u7684\u4ea4\u6613\u7c7b\u578b\u3002"
     },
     "firefly": {
+        "liability_direction_debit_short": "\u6b20\u6b3e",
+        "liability_direction_credit_short": "\u501f\u6b3e",
+        "interest_calc_yearly": "\u6bcf\u5e74",
+        "interest_calc_": "\u672a\u77e5",
+        "interest_calc_daily": "\u6bcf\u65e5",
+        "interest_calc_monthly": "\u6bcf\u6708",
+        "interest_calc_weekly": "\u6bcf\u5468",
+        "interest_calc_half-year": "\u6bcf\u534a\u5e74",
+        "interest_calc_quarterly": "\u6bcf\u5b63\u5ea6",
         "spent": "\u652f\u51fa",
-        "administration_owner": "Administration owner: {{email}}",
-        "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
-        "administration_role_mng_budgets": "Manage budgets",
-        "administration_role_mng_piggies": "Manage piggy banks",
-        "administration_role_mng_subscriptions": "Manage subscriptions",
-        "administration_role_mng_rules": "Manage rules",
-        "administration_role_mng_recurring": "Manage recurring transactions ",
-        "administration_role_mng_webhooks": "Manage webhooks",
-        "administration_role_mng_currencies": "Manage currencies",
-        "administration_role_view_reports": "View reports",
-        "administration_role_full": "Full access",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "administration_owner": "\u7ba1\u7406\u5458\u5f52\u5c5e: {{email}}",
+        "administration_you": "\u4f60\u7684\u89d2\u8272: {{role}}",
+        "administration_role_owner": "\u6240\u6709\u8005",
+        "administration_role_ro": "\u53ea\u8bfb",
+        "administration_role_mng_trx": "\u7ba1\u7406\u4ea4\u6613",
+        "administration_role_mng_meta": "\u7ba1\u7406\u5206\u7c7b\u548c\u5143\u6570\u636e",
+        "administration_role_mng_budgets": "\u7ba1\u7406\u9884\u7b97",
+        "administration_role_mng_piggies": "\u7ba1\u7406\u5b58\u94b1\u7f50",
+        "administration_role_mng_subscriptions": "\u7ba1\u7406\u8ba2\u9605",
+        "administration_role_mng_rules": "\u7ba1\u7406\u89c4\u5219",
+        "administration_role_mng_recurring": "\u7ba1\u7406\u5b9a\u671f\u4ea4\u6613 ",
+        "administration_role_mng_webhooks": "\u7ba1\u7406 Webhooks",
+        "administration_role_mng_currencies": "\u7ba1\u7406\u5e01\u79cd",
+        "administration_role_view_reports": "\u67e5\u770b\u62a5\u8868",
+        "administration_role_full": "\u5b8c\u5168\u8bbf\u95ee",
+        "new_administration_created": "\u65b0\u7684\u8d22\u52a1\u7ba1\u7406\u5458 \"{{title}}\" \u5df2\u521b\u5efa",
         "left": "\u5269\u4f59",
         "paid": "\u5df2\u4ed8\u6b3e",
         "errors_submission_v2": "\u60a8\u63d0\u4ea4\u7684\u5185\u5bb9\u6709\u8bef\uff0c\u8bf7\u68c0\u67e5\u9519\u8bef\u4fe1\u606f: {{errorMessage}}",

public/v2/i18n/zh-tw.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "\u6bcf\u5e74",
+        "interest_calc_": "\u672a\u77e5",
+        "interest_calc_daily": "\u6bcf\u65e5",
+        "interest_calc_monthly": "\u6bcf\u6708",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "\u652f\u51fa",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

public/v2/i18n/zh_CN.json

@@ -10,40 +10,49 @@
         "title": "\u6807\u9898"
     },
     "list": {
-        "drag_and_drop": "Drag and drop",
+        "drag_and_drop": "\u62d6\u653e",
         "active": "\u662f\u5426\u542f\u7528\uff1f",
         "name": "\u540d\u79f0",
         "type": "\u7c7b\u578b",
-        "number": "Account number",
+        "number": "\u8d26\u6237\u53f7\u7801",
         "liability_type": "\u503a\u52a1\u7c7b\u578b",
-        "current_balance": "Current balance",
-        "last_activity": "Last activity",
-        "amount_due": "Amount due",
-        "balance_difference": "Balance difference",
-        "menu": "Menu"
+        "current_balance": "\u5f53\u524d\u4f59\u989d",
+        "last_activity": "\u6700\u540e\u6d3b\u52a8",
+        "amount_due": "\u5230\u671f\u91d1\u989d",
+        "balance_difference": "\u4f59\u989d\u5dee",
+        "menu": "\u83dc\u5355"
     },
     "validation": {
         "bad_type_source": "Firefly III \u65e0\u6cd5\u786e\u5b9a\u57fa\u4e8e\u6b64\u6e90\u8d26\u6237\u7684\u4ea4\u6613\u7c7b\u578b\u3002",
         "bad_type_destination": "Firefly III \u65e0\u6cd5\u786e\u5b9a\u57fa\u4e8e\u6b64\u76ee\u6807\u5e10\u6237\u7684\u4ea4\u6613\u7c7b\u578b\u3002"
     },
     "firefly": {
+        "liability_direction_debit_short": "\u6b20\u6b3e",
+        "liability_direction_credit_short": "\u501f\u6b3e",
+        "interest_calc_yearly": "\u6bcf\u5e74",
+        "interest_calc_": "\u672a\u77e5",
+        "interest_calc_daily": "\u6bcf\u65e5",
+        "interest_calc_monthly": "\u6bcf\u6708",
+        "interest_calc_weekly": "\u6bcf\u5468",
+        "interest_calc_half-year": "\u6bcf\u534a\u5e74",
+        "interest_calc_quarterly": "\u6bcf\u5b63\u5ea6",
         "spent": "\u652f\u51fa",
-        "administration_owner": "Administration owner: {{email}}",
-        "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
-        "administration_role_mng_budgets": "Manage budgets",
-        "administration_role_mng_piggies": "Manage piggy banks",
-        "administration_role_mng_subscriptions": "Manage subscriptions",
-        "administration_role_mng_rules": "Manage rules",
-        "administration_role_mng_recurring": "Manage recurring transactions ",
-        "administration_role_mng_webhooks": "Manage webhooks",
-        "administration_role_mng_currencies": "Manage currencies",
-        "administration_role_view_reports": "View reports",
-        "administration_role_full": "Full access",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "administration_owner": "\u7ba1\u7406\u5458\u5f52\u5c5e: {{email}}",
+        "administration_you": "\u4f60\u7684\u89d2\u8272: {{role}}",
+        "administration_role_owner": "\u6240\u6709\u8005",
+        "administration_role_ro": "\u53ea\u8bfb",
+        "administration_role_mng_trx": "\u7ba1\u7406\u4ea4\u6613",
+        "administration_role_mng_meta": "\u7ba1\u7406\u5206\u7c7b\u548c\u5143\u6570\u636e",
+        "administration_role_mng_budgets": "\u7ba1\u7406\u9884\u7b97",
+        "administration_role_mng_piggies": "\u7ba1\u7406\u5b58\u94b1\u7f50",
+        "administration_role_mng_subscriptions": "\u7ba1\u7406\u8ba2\u9605",
+        "administration_role_mng_rules": "\u7ba1\u7406\u89c4\u5219",
+        "administration_role_mng_recurring": "\u7ba1\u7406\u5b9a\u671f\u4ea4\u6613 ",
+        "administration_role_mng_webhooks": "\u7ba1\u7406 Webhooks",
+        "administration_role_mng_currencies": "\u7ba1\u7406\u5e01\u79cd",
+        "administration_role_view_reports": "\u67e5\u770b\u62a5\u8868",
+        "administration_role_full": "\u5b8c\u5168\u8bbf\u95ee",
+        "new_administration_created": "\u65b0\u7684\u8d22\u52a1\u7ba1\u7406\u5458 \"{{title}}\" \u5df2\u521b\u5efa",
         "left": "\u5269\u4f59",
         "paid": "\u5df2\u4ed8\u6b3e",
         "errors_submission_v2": "\u60a8\u63d0\u4ea4\u7684\u5185\u5bb9\u6709\u8bef\uff0c\u8bf7\u68c0\u67e5\u9519\u8bef\u4fe1\u606f: {{errorMessage}}",

public/v2/i18n/zh_TW.json

@@ -27,6 +27,15 @@
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."
     },
     "firefly": {
+        "liability_direction_debit_short": "Owe this debt",
+        "liability_direction_credit_short": "Owed this debt",
+        "interest_calc_yearly": "\u6bcf\u5e74",
+        "interest_calc_": "\u672a\u77e5",
+        "interest_calc_daily": "\u6bcf\u65e5",
+        "interest_calc_monthly": "\u6bcf\u6708",
+        "interest_calc_weekly": "Per week",
+        "interest_calc_half-year": "Per half year",
+        "interest_calc_quarterly": "Per quarter",
         "spent": "\u652f\u51fa",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",

resources/assets/sass/_variables.scss

@@ -1,58 +0,0 @@
-/*!
- * _variables.scss
- * Copyright (c) 2019 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-/* TODO REMOVE ME */
-// Body
-$body-bg: #f5f8fa;
-
-// Borders
-$laravel-border-color: darken($body-bg, 10%);
-$list-group-border: $laravel-border-color;
-$navbar-default-border: $laravel-border-color;
-$panel-default-border: $laravel-border-color;
-$panel-inner-border: $laravel-border-color;
-
-// Brands
-$brand-primary: #3097D1;
-$brand-info: #8eb4cb;
-$brand-success: #2ab27b;
-$brand-warning: #cbb956;
-$brand-danger: #bf5329;
-
-// Typography
-$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
-$font-family-sans-serif: "Raleway", sans-serif;
-$font-size-base: 14px;
-$line-height-base: 1.6;
-$text-color: #636b6f;
-
-// Navbar
-$navbar-default-bg: #fff;
-
-// Buttons
-$btn-default-color: $text-color;
-
-// Inputs
-$input-border: lighten($text-color, 40%);
-$input-border-focus: lighten($brand-primary, 25%);
-$input-color-placeholder: lighten($text-color, 30%);
-
-// Panels
-$panel-default-heading-bg: #fff;