Merge branch 'release/4.8.1.6'

2026-01-10 12:24:50 +00:00 · 2019-10-24 18:38:20 +02:00
parent 9f1fc0c2b8 b7862b7d69
commit ea341018ac
20 changed files with 137 additions and 120 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: required
 language: bash
 env:
-  - VERSION=4.8.1.5
+  - VERSION=4.8.1.6

 dist: xenial

--- a/app/Api/V1/Requests/TransactionStoreRequest.php
+++ b/app/Api/V1/Requests/TransactionStoreRequest.php
@@ -89,7 +89,7 @@ class TransactionStoreRequest extends Request

            // amount
            'transactions.*.amount'                => 'required|numeric|more:0',
-            'transactions.*.foreign_amount'        => 'numeric|more:0',
+            'transactions.*.foreign_amount'        => 'numeric',

            // description
            'transactions.*.description'           => 'nullable|between:1,1000',
--- a/app/Http/Controllers/Transaction/CreateController.php
+++ b/app/Http/Controllers/Transaction/CreateController.php
@@ -25,7 +25,6 @@ namespace FireflyIII\Http\Controllers\Transaction;


 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;

 /**
@@ -75,9 +74,11 @@ class CreateController extends Controller
        $subTitleIcon         = 'fa-plus';
        $optionalFields       = app('preferences')->get('transaction_journal_optional_fields', [])->data;
        $allowedOpposingTypes = config('firefly.allowed_opposing_types');
-        $accountToTypes = config('firefly.account_to_transaction');
-        $defaultCurrency = app('amount')->getDefaultCurrency();
-        $previousUri = $this->rememberPreviousUri('transactions.create.uri');
+        $accountToTypes       = config('firefly.account_to_transaction');
+        $defaultCurrency      = app('amount')->getDefaultCurrency();
+        $previousUri          = $this->rememberPreviousUri('transactions.create.uri');
+        $parts                = parse_url($previousUri);
+        $previousUri          = sprintf('%s://%s/%s', $parts['scheme'], $parts['host'], $parts['path']);

        session()->put('preFilled', $preFilled);

--- a/app/Http/Controllers/Transaction/EditController.php
+++ b/app/Http/Controllers/Transaction/EditController.php
@@ -82,6 +82,9 @@ class EditController extends Controller
        $defaultCurrency      = app('amount')->getDefaultCurrency();
        $cash                 = $repository->getCashAccount();
        $previousUri          = $this->rememberPreviousUri('transactions.edit.uri');
+        $parts                = parse_url($previousUri);
+        $previousUri          = sprintf('%s://%s/%s', $parts['scheme'], $parts['host'], $parts['path']);
+

        return view('transactions.edit', compact('cash', 'transactionGroup', 'allowedOpposingTypes', 'accountToTypes', 'defaultCurrency', 'previousUri'));
    }
--- a/app/Support/Repositories/Recurring/CalculateXOccurrencesSince.php
+++ b/app/Support/Repositories/Recurring/CalculateXOccurrencesSince.php
@@ -27,6 +27,7 @@ namespace FireflyIII\Support\Repositories\Recurring;

 use Carbon\Carbon;
 use Log;
+
 /**
 * Class CalculateXOccurrencesSince
 */
@@ -204,7 +205,7 @@ trait CalculateXOccurrencesSince
     */
    protected function getXYearlyOccurrencesSince(Carbon $date, Carbon $afterDate, int $count, int $skipMod, string $moment): array
    {
-        Log::debug(sprintf('Now in %s', __METHOD__));
+        Log::debug(sprintf('Now in %s(%s, %d, %d, %s)', __METHOD__, $date->format('Y-m-d'), $date->format('Y-m-d'), $count, $skipMod));
        $return     = [];
        $mutator    = clone $date;
        $total      = 0;
@@ -212,11 +213,17 @@ trait CalculateXOccurrencesSince
        $date       = new Carbon($moment);
        $date->year = $mutator->year;
        if ($mutator > $date) {
+            Log::debug(sprintf('mutator (%s) > date (%s), so add a year to date (%s)', $mutator->format('Y-m-d'), $date->format('Y-m-d'), $date->format('Y-m-d'),));
            $date->addYear();
+            Log::debug(sprintf('Date is now %s', $date->format('Y-m-d')));
        }
        $obj = clone $date;
        while ($total < $count) {
-            if (0 === $attempts % $skipMod && $mutator->gte($afterDate)) {
+            Log::debug(sprintf('total (%d) < count (%d) so go.', $total, $count));
+            Log::debug(sprintf('attempts (%d) %% skipmod (%d) === %d', $attempts, $skipMod, $attempts % $skipMod));
+            Log::debug(sprintf('Obj (%s) gte afterdate (%s)? %s', $obj->format('Y-m-d'), $afterDate->format('Y-m-d'), var_export($obj->gte($afterDate), true)));
+            if (0 === $attempts % $skipMod && $obj->gte($afterDate)) {
+                Log::debug('All conditions true, add obj.');
                $return[] = clone $obj;
                $total++;
            }
--- a/app/Support/Search/Search.php
+++ b/app/Support/Search/Search.php
@@ -127,9 +127,6 @@ class Search implements SearchInterface
        $matches             = [];
        preg_match_all($pattern, $filteredQuery, $matches);

-        var_dump($matches[0]);
-        exit;
-
        foreach ($matches[0] as $match) {
            $this->extractModifier($match);
            $filteredQuery = str_replace($match, '', $filteredQuery);
--- a/app/Validation/TransactionValidation.php
+++ b/app/Validation/TransactionValidation.php
@@ -162,7 +162,9 @@ trait TransactionValidation
        $transactions = $data['transactions'] ?? [];
        foreach ($transactions as $index => $transaction) {
            // if foreign amount is present, then the currency must be as well.
-            if (isset($transaction['foreign_amount']) && !(isset($transaction['foreign_currency_id']) || isset($transaction['foreign_currency_code']))) {
+            if (isset($transaction['foreign_amount']) && !(isset($transaction['foreign_currency_id']) || isset($transaction['foreign_currency_code']))
+                && 0 !== bccomp('0', $transaction['foreign_amount'])
+            ) {
                $validator->errors()->add(
                    'transactions.' . $index . '.foreign_amount',
                    (string)trans('validation.require_currency_info')
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## [4.8.1.6 (API 0.10.4)] - 2019-10-25
+
+### Fixed
+- Redirecting to an URL with parameters works well now for editing and creating transactions.
+- [Issue 2756](https://github.com/firefly-iii/firefly-iii/issues/2756) Search was broken due to left-over debug statements.
+- [Issue 2757](https://github.com/firefly-iii/firefly-iii/issues/2757) 2FA was broken due to a changed library.
+- [Issue 2758](https://github.com/firefly-iii/firefly-iii/issues/2758) A debug command courtesy of Laravel wouldn't work due to invalid routes.
+- [Issue 2701](https://github.com/firefly-iii/firefly-iii/issues/2701) Fixed a never-ending loop.
+
 ## [4.8.1.5 (API 0.10.4)] - 2019-10-21

 ### Added
@@ -14,12 +23,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [Issue 2734](https://github.com/firefly-iii/firefly-iii/issues/2734) Put personal access token in textarea for easier copy/pasting.
 - [Issue 2728](https://github.com/firefly-iii/firefly-iii/issues/2728) Remove superfluous currency names.

-### Deprecated
- Initial release.
-
-### Removed
- Initial release.
-
 ### Fixed
 - [Issue 2699](https://github.com/firefly-iii/firefly-iii/issues/2699) Internal cache wouldn't update.
 - [Issue 2713](https://github.com/firefly-iii/firefly-iii/issues/2713) Could not search for numerical values.
@@ -31,9 +34,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [Issue 2746](https://github.com/firefly-iii/firefly-iii/issues/2746) Cache would not clear after firing recurring transactions.
 - [Issue 2755](https://github.com/firefly-iii/firefly-iii/issues/2755) Making a rule inactive would still fire it.

-### Security
- Initial release.
-
 ### API
 - [Issue 2698](https://github.com/firefly-iii/firefly-iii/issues/2698) Fix return value in API.
 - [Issue 2753](https://github.com/firefly-iii/firefly-iii/issues/2753) Was possible to upload and manage empty attachments.
--- a/composer.json
+++ b/composer.json
@@ -84,7 +84,7 @@
    "league/fractal": "0.*",
    "litipk/flysystem-fallback-adapter": "0.*",
    "mschindler83/fints-hbci-php": "1.*",
-    "pragmarx/google2fa": "7.*",
+    "pragmarx/google2fa": "6.1.3",
    "pragmarx/google2fa-laravel": "1.*",
    "pragmarx/recovery": "^0.1.0",
    "rcrowe/twigbridge": "0.9.*"
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "2bb65bbd943e05cc3619e7ddc4add0b6",
+    "content-hash": "94b5f6a85599a13e02f280556fa2e3ef",
    "packages": [
        {
            "name": "adldap2/adldap2",
@@ -1187,27 +1187,28 @@
        },
        {
            "name": "guzzlehttp/guzzle",
-            "version": "6.3.3",
+            "version": "6.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+                "reference": "0895c932405407fd3a7368b6910c09a24d26db11"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11",
+                "reference": "0895c932405407fd3a7368b6910c09a24d26db11",
                "shasum": ""
            },
            "require": {
+                "ext-json": "*",
                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.4",
+                "guzzlehttp/psr7": "^1.6.1",
                "php": ">=5.5"
            },
            "require-dev": {
                "ext-curl": "*",
                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.0"
+                "psr/log": "^1.1"
            },
            "suggest": {
                "psr/log": "Required for using the Log middleware"
@@ -1219,12 +1220,12 @@
                }
            },
            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
                "psr-4": {
                    "GuzzleHttp\\": "src/"
-                }
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -1248,7 +1249,7 @@
                "rest",
                "web service"
            ],
-            "time": "2018-04-22T15:46:56+00:00"
+            "time": "2019-10-23T15:58:00+00:00"
        },
        {
            "name": "guzzlehttp/promises",
@@ -2749,16 +2750,16 @@
        },
        {
            "name": "pragmarx/google2fa",
-            "version": "v7.0.0",
+            "version": "v6.1.3",
            "source": {
                "type": "git",
                "url": "https://github.com/antonioribeiro/google2fa.git",
-                "reference": "0afb47f8a686bd203fe85a05bab85139f3c1971e"
+                "reference": "cce23ec9b276d29ce9afc6830b12c20452993875"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/0afb47f8a686bd203fe85a05bab85139f3c1971e",
-                "reference": "0afb47f8a686bd203fe85a05bab85139f3c1971e",
+                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/cce23ec9b276d29ce9afc6830b12c20452993875",
+                "reference": "cce23ec9b276d29ce9afc6830b12c20452993875",
                "shasum": ""
            },
            "require": {
@@ -2801,20 +2802,20 @@
                "Two Factor Authentication",
                "google2fa"
            ],
-            "time": "2019-10-21T17:49:22+00:00"
+            "time": "2019-10-02T18:46:33+00:00"
        },
        {
            "name": "pragmarx/google2fa-laravel",
-            "version": "v1.2.0",
+            "version": "v1.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/antonioribeiro/google2fa-laravel.git",
-                "reference": "6e43058759963ac15202008f204ef8c996b6ec0d"
+                "reference": "4ccc17dbf5ab5f752113cb6088a5afce5191309e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/antonioribeiro/google2fa-laravel/zipball/6e43058759963ac15202008f204ef8c996b6ec0d",
-                "reference": "6e43058759963ac15202008f204ef8c996b6ec0d",
+                "url": "https://api.github.com/repos/antonioribeiro/google2fa-laravel/zipball/4ccc17dbf5ab5f752113cb6088a5afce5191309e",
+                "reference": "4ccc17dbf5ab5f752113cb6088a5afce5191309e",
                "shasum": ""
            },
            "require": {
@@ -2872,7 +2873,7 @@
                "google2fa",
                "laravel"
            ],
-            "time": "2019-09-30T17:17:12+00:00"
+            "time": "2019-10-21T18:34:37+00:00"
        },
        {
            "name": "pragmarx/google2fa-qrcode",
@@ -5046,16 +5047,16 @@
        },
        {
            "name": "tightenco/collect",
-            "version": "v6.3.0",
+            "version": "v6.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/tightenco/collect.git",
-                "reference": "7f3f798cb71aa509f5d6e0d1b8f5f4ae0e510869"
+                "reference": "48b88a0e488fba617f077e0f89bae286b35d9eef"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/tightenco/collect/zipball/7f3f798cb71aa509f5d6e0d1b8f5f4ae0e510869",
-                "reference": "7f3f798cb71aa509f5d6e0d1b8f5f4ae0e510869",
+                "url": "https://api.github.com/repos/tightenco/collect/zipball/48b88a0e488fba617f077e0f89bae286b35d9eef",
+                "reference": "48b88a0e488fba617f077e0f89bae286b35d9eef",
                "shasum": ""
            },
            "require": {
@@ -5084,7 +5085,7 @@
            "authors": [
                {
                    "name": "Taylor Otwell",
-                    "email": "taylor@laravel.com"
+                    "email": "taylorotwell@gmail.com"
                }
            ],
            "description": "Collect - Illuminate Collections as a separate package.",
@@ -5092,25 +5093,27 @@
                "collection",
                "laravel"
            ],
-            "time": "2019-10-05T20:15:22+00:00"
+            "time": "2019-10-23T14:47:45+00:00"
        },
        {
            "name": "tijsverkoyen/css-to-inline-styles",
-            "version": "2.2.1",
+            "version": "2.2.2",
            "source": {
                "type": "git",
                "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
-                "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757"
+                "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757",
-                "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757",
+                "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/dda2ee426acd6d801d5b7fd1001cde9b5f790e15",
+                "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15",
                "shasum": ""
            },
            "require": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
                "php": "^5.5 || ^7.0",
-                "symfony/css-selector": "^2.7 || ^3.0 || ^4.0"
+                "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0"
            },
            "require-dev": {
                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
@@ -5139,7 +5142,7 @@
            ],
            "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
            "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
-            "time": "2017-11-27T11:13:29+00:00"
+            "time": "2019-10-24T08:53:34+00:00"
        },
        {
            "name": "twig/twig",
@@ -7680,16 +7683,16 @@
        },
        {
            "name": "seld/jsonlint",
-            "version": "1.7.1",
+            "version": "1.7.2",
            "source": {
                "type": "git",
                "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38"
+                "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38",
-                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e2e5d290e4d2a4f0eb449f510071392e00e10d19",
+                "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19",
                "shasum": ""
            },
            "require": {
@@ -7725,7 +7728,7 @@
                "parser",
                "validator"
            ],
-            "time": "2018-01-24T12:46:19+00:00"
+            "time": "2019-10-24T14:27:39+00:00"
        },
        {
            "name": "seld/phar-utils",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -125,7 +125,7 @@ return [
        'is_demo_site'     => false,
    ],
    'encryption'                   => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true,
-    'version'                      => '4.8.1.5',
+    'version'                      => '4.8.1.6',
    'api_version'                  => '0.10.4',
    'db_version'                   => 11,
    'maxUploadSize'                => 15242880,
--- a/readme.md
+++ b/readme.md
@@ -9,22 +9,26 @@
 [![Donate using GitHub](https://img.shields.io/badge/donate-GitHub-green?logo=github&style=flat)](https://github.com/sponsors/JC5)


-* [Introduction](#introduction)
-	* [Purpose](#purpose)
-	* [Features](#features)
-	* [Who is it for?](#who-is-it-for)
-* [Get started](#get-started)
-	* [Update your instance](#update-your-instance)
-* [Contribute](#contribute)
-* [The goal](#the-goal)
-* [Contact](#contact)
-* [Other stuff](#other-stuff)
-    * [Tools](#tools)
-	* [Versioning](#versioning)
-	* [License](#license)
-	* [Donate](#donate)
-	* [Alternatives](#alternatives)
-	* [Badges](#badges)
+<!-- MarkdownTOC autolink="true" -->
+
+- [Introduction](#introduction)
+	- [Purpose](#purpose)
+	- [Features](#features)
+	- [Who is it for?](#who-is-it-for)
+- [Get started](#get-started)
+	- [Update your instance](#update-your-instance)
+- [Contribute](#contribute)
+- [The goal](#the-goal)
+- [Contact](#contact)
+- [Other stuff](#other-stuff)
+	- [Tools](#tools)
+	- [Versioning](#versioning)
+	- [License](#license)
+	- [Donate](#donate)
+	- [Alternatives](#alternatives)
+	- [Badges](#badges)
+
+<!-- /MarkdownTOC -->

 ## Introduction
 "Firefly III" is a (self-hosted) manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. It can import data from external sources and it has many neat financial reports available. Here are some screenshots:
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -759,9 +759,9 @@ return [
    'list_inactive_rule'                        => 'Inaktive Regeln',

    // accounts:
-    'inactive_account_link'                     => 'You have :count inactive (archived) accounts, which you can view on this separate page.',
-    'all_accounts_inactive'                     => 'These are your inactive accounts.',
-    'active_account_link'                       => 'This link goes back to your active accounts.',
+    'inactive_account_link'                     => 'Sie haben :count inaktive (archivierte) Konten, die Sie auf dieser separaten Seite einsehen können.',
+    'all_accounts_inactive'                     => 'Dies sind Ihre inaktiven Konten.',
+    'active_account_link'                       => 'Diese Verknüpfung führt zurück zu Ihren aktiven Konten.',
    'account_missing_transaction'               => 'Konto #:id („:name”) kann nicht direkt angezeigt werden, da Firefly III Weiterleitungsinformationen fehlen.',
    'details_for_asset'                         => 'Details zum Bestandskonto „:name”',
    'details_for_expense'                       => 'Details zum Kreditor (Ausgabenkonto) „:name”',
@@ -789,9 +789,9 @@ return [
    'make_new_revenue_account'                  => 'Neuen Schuldner anlegen',
    'make_new_liabilities_account'              => 'Neue Verbindlichkeit anlegen',
    'asset_accounts'                            => 'Bestandskonten',
-    'asset_accounts_inactive'                   => 'Asset accounts (inactive)',
+    'asset_accounts_inactive'                   => 'Bestandskonten (inaktiv)',
    'expense_accounts'                          => 'Kreditoren (Ausgabenkonten)',
-    'expense_accounts_inactive'                 => 'Expense accounts (inactive)',
+    'expense_accounts_inactive'                 => 'Aufwandskonten (inaktiv)',
    'revenue_accounts'                          => 'Schuldner',
    'cash_accounts'                             => 'Geldbörsen',
    'Cash account'                              => 'Geldbörse',
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -759,9 +759,9 @@ return [
    'list_inactive_rule'                        => 'regla inactiva',

    // accounts:
-    'inactive_account_link'                     => 'You have :count inactive (archived) accounts, which you can view on this separate page.',
-    'all_accounts_inactive'                     => 'These are your inactive accounts.',
-    'active_account_link'                       => 'This link goes back to your active accounts.',
+    'inactive_account_link'                     => 'Tiene :count cuentas inactivas (archivadas), que puede ver en esta página separada.',
+    'all_accounts_inactive'                     => 'Estas son sus cuentas inactivas.',
+    'active_account_link'                       => 'Este enlace se regresa a sus cuentas activas.',
    'account_missing_transaction'               => 'Cuenta #:id (":name") no puede ser vista directamente, Firefly perdió información de redirección.',
    'details_for_asset'                         => 'Detalles para la cuenta de activos ":name"',
    'details_for_expense'                       => 'Detalles para la cuenta de gastos ":name"',
@@ -789,9 +789,9 @@ return [
    'make_new_revenue_account'                  => 'Crear nueva cuenta de ingresos',
    'make_new_liabilities_account'              => 'Crear un nuevo pasivo',
    'asset_accounts'                            => 'Cuenta de activos',
-    'asset_accounts_inactive'                   => 'Asset accounts (inactive)',
+    'asset_accounts_inactive'                   => 'Cuentas de activos (inactivas)',
    'expense_accounts'                          => 'Cuentas de gastos',
-    'expense_accounts_inactive'                 => 'Expense accounts (inactive)',
+    'expense_accounts_inactive'                 => 'Cuentas de gastos (inactivas)',
    'revenue_accounts'                          => 'Cuentas de ingresos',
    'cash_accounts'                             => 'Cuentas de efectivo',
    'Cash account'                              => 'Cuenta de efectivo',
--- a/resources/lang/it_IT/firefly.php
+++ b/resources/lang/it_IT/firefly.php
@@ -759,9 +759,9 @@ return [
    'list_inactive_rule'                        => 'regola inattiva',

    // accounts:
-    'inactive_account_link'                     => 'You have :count inactive (archived) accounts, which you can view on this separate page.',
-    'all_accounts_inactive'                     => 'These are your inactive accounts.',
-    'active_account_link'                       => 'This link goes back to your active accounts.',
+    'inactive_account_link'                     => 'Hai :count conti inattivi (archiviati) che puoi visualizzare in questa pagina separata.',
+    'all_accounts_inactive'                     => 'Questi sono i tuoi conti inattivi.',
+    'active_account_link'                       => 'Questo collegamento ti riporta ai conti attivi.',
    'account_missing_transaction'               => 'Non è possibile visualizzare il conto #:id (":name") direttamente, a Firefly mancano le informazioni per il reindirizzamento.',
    'details_for_asset'                         => 'Dettagli per conto attività ":name"',
    'details_for_expense'                       => 'Dettagli per conto uscite ":name"',
@@ -789,9 +789,9 @@ return [
    'make_new_revenue_account'                  => 'Crea nuovo conto entrate',
    'make_new_liabilities_account'              => 'Crea una nuova passività',
    'asset_accounts'                            => 'Conti attività',
-    'asset_accounts_inactive'                   => 'Asset accounts (inactive)',
+    'asset_accounts_inactive'                   => 'Conti attività (inattivi)',
    'expense_accounts'                          => 'Conti uscite',
-    'expense_accounts_inactive'                 => 'Expense accounts (inactive)',
+    'expense_accounts_inactive'                 => 'Conti spese (inattivi)',
    'revenue_accounts'                          => 'Conti entrate',
    'cash_accounts'                             => 'Conti contanti',
    'Cash account'                              => 'Conto contanti',
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -240,8 +240,8 @@ return [
    'search_modifier_amount_min'                 => 'Bedrag is minstens :value',
    'search_modifier_amount_less'                => 'Bedrag is minder dan :value',
    'search_modifier_amount_more'                => 'Bedrag is meer dan :value',
-    'search_modifier_source'                     => 'Bronrekening is :value',
-    'search_modifier_from'                       => 'Bronrekening is :value',
+    'search_modifier_source'                     => 'Bronrekeningnaam is :value',
+    'search_modifier_from'                       => 'Bronrekeningnaam is :value',
    'search_modifier_destination'                => 'Doelrekening is :value',
    'search_modifier_to'                         => 'Doelrekening is :value',
    'search_modifier_tag'                        => 'Tag is ":value"',
@@ -255,8 +255,8 @@ return [
    'search_modifier_on'                         => 'Transactiedatum is :value',
    'search_modifier_before'                     => 'Transactiedatum is vóór :value',
    'search_modifier_after'                      => 'Transactiedatum is na :value',
-    'search_modifier_created_on'                 => 'Transaction was created on :value',
-    'search_modifier_updated_on'                 => 'Transaction was last updated on :value',
+    'search_modifier_created_on'                 => 'Transactie werd gemaakt op :value',
+    'search_modifier_updated_on'                 => 'Transactie werd laatst gewijzigd op :value',
    'modifiers_applies_are'                      => 'De volgende wijzigingen worden ook toegepast op de zoekopdracht:',
    'general_search_error'                       => 'Er is een fout opgetreden tijdens het zoeken. Controleer de log-bestanden voor meer informatie.',
    'search_box'                                 => 'Zoeken',
@@ -343,13 +343,13 @@ return [

    // actions and triggers
    'rule_trigger_user_action'                   => 'Gebruikersactie is ":trigger_value"',
-    'rule_trigger_from_account_starts_choice'    => 'Bronrekening naam begint met..',
+    'rule_trigger_from_account_starts_choice'    => 'Bronrekeningnaam begint met..',
    'rule_trigger_from_account_starts'           => 'Bronrekeningnaam begint met ":trigger_value"',
-    'rule_trigger_from_account_ends_choice'      => 'Bronrekening eindigt op..',
+    'rule_trigger_from_account_ends_choice'      => 'Bronrekeningnaam eindigt op..',
    'rule_trigger_from_account_ends'             => 'Bronrekeningnaam eindigt op ":trigger_value"',
-    'rule_trigger_from_account_is_choice'        => 'Bronrekening is..',
+    'rule_trigger_from_account_is_choice'        => 'Bronrekeningnaam is..',
    'rule_trigger_from_account_is'               => 'Bronrekeningnaam is ":trigger_value"',
-    'rule_trigger_from_account_contains_choice'  => 'Bronrekening bevat..',
+    'rule_trigger_from_account_contains_choice'  => 'Bronrekeningnaam bevat..',
    'rule_trigger_from_account_contains'         => 'Bronrekeningnaam bevat ":trigger_value"',
    'rule_trigger_to_account_starts_choice'      => 'Doelrekeningnaam begint met..',
    'rule_trigger_to_account_starts'             => 'Doelrekeningnaam begint met ":trigger_value"',
@@ -759,9 +759,9 @@ return [
    'list_inactive_rule'                        => 'inactieve regel',

    // accounts:
-    'inactive_account_link'                     => 'You have :count inactive (archived) accounts, which you can view on this separate page.',
-    'all_accounts_inactive'                     => 'These are your inactive accounts.',
-    'active_account_link'                       => 'This link goes back to your active accounts.',
+    'inactive_account_link'                     => 'Je hebt :count inactieve (gearchiveerde) rekeningen, die je kan bekijken op deze aparte pagina.',
+    'all_accounts_inactive'                     => 'Dit zijn je inactieve rekeningen.',
+    'active_account_link'                       => 'Deze link gaat terug naar je actieve rekeningen.',
    'account_missing_transaction'               => 'Rekening #:id (":name") kan je niet bekijken in Firefly III, maar het origineel is kwijt.',
    'details_for_asset'                         => 'Overzicht voor betaalrekening ":name"',
    'details_for_expense'                       => 'Overzicht voor crediteur ":name"',
@@ -789,9 +789,9 @@ return [
    'make_new_revenue_account'                  => 'Nieuwe debiteur',
    'make_new_liabilities_account'              => 'Maak nieuwe passiva',
    'asset_accounts'                            => 'Betaalrekeningen',
-    'asset_accounts_inactive'                   => 'Asset accounts (inactive)',
+    'asset_accounts_inactive'                   => 'Betaalrekeningen (inactief)',
    'expense_accounts'                          => 'Crediteuren',
-    'expense_accounts_inactive'                 => 'Expense accounts (inactive)',
+    'expense_accounts_inactive'                 => 'Crediteuren (inactief)',
    'revenue_accounts'                          => 'Debiteuren',
    'cash_accounts'                             => 'Contant geldrekeningen',
    'Cash account'                              => 'Contant geldrekening',
--- a/resources/lang/pl_PL/intro.php
+++ b/resources/lang/pl_PL/intro.php
@@ -33,11 +33,11 @@ return [
    'index_cash_account'                              => 'To są dotychczas utworzone konta. Możesz użyć konta gotówkowego do śledzenia wydatków gotówkowych, ale oczywiście nie jest to obowiązkowe.',

    // transactions (withdrawal)
-    'transactions_create_withdrawal_source'           => 'Select your favorite asset account or liability from this dropdown.',
-    'transactions_create_withdrawal_destination'      => 'Select an expense account here. Leave it empty if you want to make a cash expense.',
-    'transactions_create_withdrawal_foreign_currency' => 'Use this field to set a foreign currency and amount.',
-    'transactions_create_withdrawal_more_meta'        => 'Plenty of other meta data you set in these fields.',
-    'transactions_create_withdrawal_split_add'        => 'If you want to split a transaction, add more splits with this button',
+    'transactions_create_withdrawal_source'           => 'Wybierz swoje ulubione konto aktywów lub zobowiązanie z tej listy rozwijalnej.',
+    'transactions_create_withdrawal_destination'      => 'Wybierz konto wydatków. Zostaw puste, jeśli chcesz zapisać wydatek gotówkowy.',
+    'transactions_create_withdrawal_foreign_currency' => 'Użyj tego pola aby ustawić obcą walutę i jej ilość.',
+    'transactions_create_withdrawal_more_meta'        => 'Mnóstwo innych metadanych, które ustawiasz w tych polach.',
+    'transactions_create_withdrawal_split_add'        => 'Jeżeli chcesz podzielić transakcję, dodaj więcej podziałów używając tego przycisku',

    // transactions (deposit)
    'transactions_create_deposit_source'              => 'Select or type the payee in this auto-completing dropdown/textbox. Leave it empty if you want to make a cash deposit.',
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -929,7 +929,7 @@ return [
    'average_spending_per_source'               => 'Average expense per source account',
    'average_earning_per_source'                => 'Average earning per source account',
    'average_earning_per_destination'           => 'Average earning per destination account',
-    'account_per_tag'                           => 'Account per tag',
+    'account_per_tag'                           => 'Conta por tag',
    'tag_report_expenses_listed_once'           => 'Expenses and income are never listed twice. If a transaction has multiple tags, it may only show up under one of its tags. This list may appear to be missing data, but the amounts will be correct.',
    'double_report_expenses_charted_once'       => 'Expenses and income are never displayed twice. If a transaction has multiple tags, it may only show up under one of its tags. This chart may appear to be missing data, but the amounts will be correct.',
    'tag_report_chart_single_tag'               => 'This chart applies to a single tag. If a transaction has multiple tags, what you see here may be reflected in the charts of other tags as well.',
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -759,9 +759,9 @@ return [
    'list_inactive_rule'                        => 'неактивное правило',

    // accounts:
-    'inactive_account_link'                     => 'You have :count inactive (archived) accounts, which you can view on this separate page.',
-    'all_accounts_inactive'                     => 'These are your inactive accounts.',
-    'active_account_link'                       => 'This link goes back to your active accounts.',
+    'inactive_account_link'                     => 'У вас есть :count неактивных (архивных) счетов, которые вы можете просмотреть на этой отдельной странице.',
+    'all_accounts_inactive'                     => 'Это ваши неактивные счета.',
+    'active_account_link'                       => 'Эта ссылка вернёт вас к вашим активным счетам.',
    'account_missing_transaction'               => 'Счёт #:id (":name") невозможно просмотреть напрямую, и у Firefly нет информации для перенаправления.',
    'details_for_asset'                         => 'Детали по основному счёту ":name"',
    'details_for_expense'                       => 'Детали по счёту расходов ":name"',
@@ -789,9 +789,9 @@ return [
    'make_new_revenue_account'                  => 'Создать новый счёт дохода',
    'make_new_liabilities_account'              => 'Создать новый долговой счёт',
    'asset_accounts'                            => 'Основные счета',
-    'asset_accounts_inactive'                   => 'Asset accounts (inactive)',
+    'asset_accounts_inactive'                   => 'Основной счёт (неактивный)',
    'expense_accounts'                          => 'Счета расходов',
-    'expense_accounts_inactive'                 => 'Expense accounts (inactive)',
+    'expense_accounts_inactive'                 => 'Счёт расходов (неактивный)',
    'revenue_accounts'                          => 'Счета доходов',
    'cash_accounts'                             => 'Наличные деньги',
    'Cash account'                              => 'Наличные деньги',
--- a/routes/web.php
+++ b/routes/web.php
@@ -958,13 +958,13 @@ Route::group(
    Route::post('destroy/{transactionGroup}', ['uses' => 'Transaction\DeleteController@destroy', 'as' => 'destroy']);

    // clone group:
-    Route::get('clone/{transactionGroup}', ['uses' => 'Transaction\CloneController@clone', 'as' => 'clone']);
+    //Route::get('clone/{transactionGroup}', ['uses' => 'Transaction\CloneController@clone', 'as' => 'clone']);

    //Route::get('debug/{tj}', ['uses' => 'Transaction\SingleController@debugShow', 'as' => 'debug']);
    //Route::get('debug/{tj}', ['uses' => 'Transaction\SingleController@debugShow', 'as' => 'debug']);

-    Route::post('reorder', ['uses' => 'TransactionController@reorder', 'as' => 'reorder']);
-    Route::post('reconcile', ['uses' => 'TransactionController@reconcile', 'as' => 'reconcile']);
+    //Route::post('reorder', ['uses' => 'TransactionController@reorder', 'as' => 'reorder']);
+    //Route::post('reconcile', ['uses' => 'TransactionController@reconcile', 'as' => 'reconcile']);
    // TODO end of improvement.