mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-12-18 12:28:46 +00:00
Fix #10290
This commit is contained in:
@@ -2131,7 +2131,7 @@ return [
|
|||||||
'bulk_edit' => 'Edit selected in bulk',
|
'bulk_edit' => 'Edit selected in bulk',
|
||||||
'mass_delete' => 'Delete selected',
|
'mass_delete' => 'Delete selected',
|
||||||
'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
|
'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
|
||||||
'cannot_change_amount_reconciled' => 'You can\'t change the amount of reconciled transactions.',
|
'cannot_change_amount_reconciled' => 'You can\'t change the amount or account(s) of reconciled transactions.',
|
||||||
'no_budget' => '(no budget)',
|
'no_budget' => '(no budget)',
|
||||||
'no_bill' => '(no subscription)',
|
'no_bill' => '(no subscription)',
|
||||||
'account_per_budget' => 'Account per budget',
|
'account_per_budget' => 'Account per budget',
|
||||||
|
|||||||
@@ -98,7 +98,10 @@
|
|||||||
<!-- Source: {{ journal.source_account_name }} ({{ journal.source_account_id }}) -->
|
<!-- Source: {{ journal.source_account_name }} ({{ journal.source_account_id }}) -->
|
||||||
<!-- Destination: {{ journal.destination_account_name }} ({{ journal.destination_account_id }}) -->
|
<!-- Destination: {{ journal.destination_account_name }} ({{ journal.destination_account_id }}) -->
|
||||||
<td style="position: relative;">
|
<td style="position: relative;">
|
||||||
|
{% if journal.reconciled == true %}
|
||||||
|
<a href="{{ route('accounts.show', [journal.source_account_id]) }}">{{ journal.source_account_name }}</a>
|
||||||
|
{% endif %}
|
||||||
|
{% if journal.reconciled == false %}
|
||||||
{# SOURCE ACCOUNT ID FOR TRANSFER OR WITHDRAWAL #}
|
{# SOURCE ACCOUNT ID FOR TRANSFER OR WITHDRAWAL #}
|
||||||
{% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Withdrawal' %}
|
{% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Withdrawal' %}
|
||||||
<select class="form-control input-sm" name="source_id[{{ journal.transaction_journal_id }}]">
|
<select class="form-control input-sm" name="source_id[{{ journal.transaction_journal_id }}]">
|
||||||
@@ -117,9 +120,13 @@
|
|||||||
name="source_name[{{ journal.transaction_journal_id }}]" type="text"
|
name="source_name[{{ journal.transaction_journal_id }}]" type="text"
|
||||||
value="{% if journal.source_type != 'Cash account' %}{{ journal.source_account_name }}{% endif %}">
|
value="{% if journal.source_type != 'Cash account' %}{{ journal.source_account_name }}{% endif %}">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td style="position: relative;">
|
<td style="position: relative;">
|
||||||
|
{% if journal.reconciled == true %}
|
||||||
|
<a href="{{ route('accounts.show', [journal.destination_account_id]) }}">{{ journal.destination_account_name }}</a>
|
||||||
|
{% endif %}
|
||||||
|
{% if journal.reconciled == false %}
|
||||||
{# DESTINATION ACCOUNT NAME FOR TRANSFER AND DEPOSIT #}
|
{# DESTINATION ACCOUNT NAME FOR TRANSFER AND DEPOSIT #}
|
||||||
{% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Deposit' %}
|
{% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Deposit' %}
|
||||||
|
|
||||||
@@ -138,6 +145,7 @@
|
|||||||
name="destination_name[{{ journal.transaction_journal_id }}]" type="text" autocomplete="off"
|
name="destination_name[{{ journal.transaction_journal_id }}]" type="text" autocomplete="off"
|
||||||
value="{% if journal.destination_type != 'Cash account' %}{{ journal.destination_account_name }}{% endif %}">
|
value="{% if journal.destination_type != 'Cash account' %}{{ journal.destination_account_name }}{% endif %}">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
{# category #}
|
{# category #}
|
||||||
<td style="position: relative;">
|
<td style="position: relative;">
|
||||||
|
|||||||
Reference in New Issue
Block a user