IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

New strings for reconciled transactions. #736

Browse Source
This commit is contained in:
James Cole 2017-11-08 09:40:38 +01:00
parent 8707bc6612
commit 78009c1cc0
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Helpers/Collector/JournalCollector.php
View File

@ -56,6 +56,7 @@ use Steam;
* *
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity) * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @SuppressWarnings(PHPMD.TooManyPublicMethods)
*/ */
class JournalCollector implements JournalCollectorInterface class JournalCollector implements JournalCollectorInterface
{ {

7
app/Http/Controllers/Transaction/MassController.php
View File

@ -159,6 +159,13 @@ class MassController extends Controller
$messages[] = trans('firefly.cannot_edit_opening_balance'); $messages[] = trans('firefly.cannot_edit_opening_balance');
continue; continue;
} }
// cannot edit reconciled transactions / journals:
if($journal->transactions->first()->reconciled) {
$messages[] = trans('firefly.cannot_edit_reconciled', ['description' => $journal->description, 'id' => $journal->id]);
continue;
}
$filtered->push($journal); $filtered->push($journal);
} }

2
public/js/ff/transactions/list.js vendored
View File

@ -72,7 +72,7 @@ function goToReconcile() {
} }
$.post(baseHref + 'transactions/reconcile', {transactions: ids}).done(function () { $.post(baseHref + 'transactions/reconcile', {transactions: ids}).done(function () {
alert('OK then.'); window.location.reload(true);
}).fail(function () { }).fail(function () {
alert('Could not reconcile transactions: please check the logs and try again later.'); alert('Could not reconcile transactions: please check the logs and try again later.');
}); });

1
resources/lang/en_US/firefly.php
View File

@ -1007,6 +1007,7 @@ return [
'split_this_transfer' => 'Split this transfer', 'split_this_transfer' => 'Split this transfer',
'cannot_edit_multiple_source' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.', 'cannot_edit_multiple_source' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple source accounts.',
'cannot_edit_multiple_dest' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.', 'cannot_edit_multiple_dest' => 'You cannot edit splitted transaction #:id with description ":description" because it contains multiple destination accounts.',
'cannot_edit_reconciled' => 'You cannot edit transaction #:id with description ":description" because it has been marked as reconciled.',
'cannot_edit_opening_balance' => 'You cannot edit the opening balance of an account.', 'cannot_edit_opening_balance' => 'You cannot edit the opening balance of an account.',
'no_edit_multiple_left' => 'You have selected no valid transactions to edit.', 'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
'cannot_convert_split_journal' => 'Cannot convert a split transaction', 'cannot_convert_split_journal' => 'Cannot convert a split transaction',