kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 14:58:40 +00:00
Code Issues Projects Releases Wiki Activity

First steps for reconciliation fix.

Browse Source
This commit is contained in:
James Cole
2019-08-02 16:31:36 +02:00
parent 494f783a2b
commit 6ac08de71d
4 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Account/ReconcileController.php
View File

@@ -117,6 +117,7 @@ class ReconcileController extends Controller
$startDate = clone $start; $startDate = clone $start;
$startDate->subDay(); $startDate->subDay();
$startBalance = round(app('steam')->balance($account, $startDate), $currency->decimal_places); $startBalance = round(app('steam')->balance($account, $startDate), $currency->decimal_places);
$endBalance = round(app('steam')->balance($account, $end), $currency->decimal_places); $endBalance = round(app('steam')->balance($account, $end), $currency->decimal_places);
$subTitleIcon = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type)); $subTitleIcon = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type));
$subTitle = (string)trans('firefly.reconcile_account', ['account' => $account->name]); $subTitle = (string)trans('firefly.reconcile_account', ['account' => $account->name]);

11
app/Http/Controllers/Json/ReconcileController.php
View File

@@ -201,11 +201,16 @@ class ReconcileController extends Controller
$inverse = true; $inverse = true;
} }
// transfer to this account? then positive amount: // transfer to this account? then positive amount:
if (TransactionType::TRANSFER === $journal['transaction_type_type'] if (TransactionType::TRANSFER === $journal['transaction_type_type'] && $account->id === $journal['destination_account_id']) {
&& $account->id === $journal['destination_account_id']
) {
$inverse = true; $inverse = true;
} }
// reconciliation into account? then positive amount:
if (TransactionType::RECONCILIATION === $journal['transaction_type_type']) {
$inverse = true;
}
if (true === $inverse) { if (true === $inverse) {
$journal['amount'] = app('steam')->positive($journal['amount']); $journal['amount'] = app('steam')->positive($journal['amount']);
if (null !== $journal['foreign_amount']) { if (null !== $journal['foreign_amount']) {

2
app/Support/Steam.php
View File

@@ -55,7 +55,7 @@ class Steam
$cache->addProperty('balance'); $cache->addProperty('balance');
$cache->addProperty($date); $cache->addProperty($date);
if ($cache->has()) { if ($cache->has()) {
return $cache->get(); // @codeCoverageIgnore //return $cache->get(); // @codeCoverageIgnore
} }
// //
/** @var AccountRepositoryInterface $repository */ /** @var AccountRepositoryInterface $repository */

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

@@ -553,24 +553,25 @@ return [
'login_with_new_email' => 'You can now login with your new email address.', 'login_with_new_email' => 'You can now login with your new email address.',
'login_with_old_email' => 'You can now login with your old email address again.', 'login_with_old_email' => 'You can now login with your old email address again.',
'login_provider_local_only' => 'This action is not available when authenticating through ":login_provider".', 'login_provider_local_only' => 'This action is not available when authenticating through ":login_provider".',
'delete_local_info_only' => 'Because you authenticate through ":login_provider", this will only delete local Firefly III information.', 'delete_local_info_only' => 'Because you authenticate through ":login_provider", this will only delete local Firefly III information.',
// attachments // attachments
'nr_of_attachments' => 'One attachment|:count attachments', 'nr_of_attachments' => 'One attachment|:count attachments',
'attachments' => 'Attachments', 'attachments' => 'Attachments',
'edit_attachment' => 'Edit attachment ":name"', 'edit_attachment' => 'Edit attachment ":name"',
'update_attachment' => 'Update attachment', 'update_attachment' => 'Update attachment',
'delete_attachment' => 'Delete attachment ":name"', 'delete_attachment' => 'Delete attachment ":name"',
'attachment_deleted' => 'Deleted attachment ":name"', 'attachment_deleted' => 'Deleted attachment ":name"',
'attachment_updated' => 'Updated attachment ":name"', 'liabilities_deleted' => 'Deleted liability ":name"',
'upload_max_file_size' => 'Maximum file size: :size', 'attachment_updated' => 'Updated attachment ":name"',
'list_all_attachments' => 'List of all attachments', 'upload_max_file_size' => 'Maximum file size: :size',
'list_all_attachments' => 'List of all attachments',
// transaction index // transaction index
'title_expenses' => 'Expenses', 'title_expenses' => 'Expenses',
'title_withdrawal' => 'Expenses', 'title_withdrawal' => 'Expenses',
'title_revenue' => 'Revenue / income', 'title_revenue' => 'Revenue / income',
'title_deposit' => 'Revenue / income', 'title_deposit' => 'Revenue / income',
'title_transfer' => 'Transfers', 'title_transfer' => 'Transfers',
'title_transfers' => 'Transfers', 'title_transfers' => 'Transfers',