kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 01:06:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10328 from firefly-iii/fix-10290

Browse Source 
Fix #10290
This commit is contained in:
James Cole
2025-05-22 06:03:05 +02:00
committed by GitHub
parent f20eccf279 1424410115
commit 2a17ec9280
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2131,7 +2131,7 @@ return [
'bulk_edit' => 'Edit selected in bulk',
'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_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_bill' => '(no subscription)',
'account_per_budget' => 'Account per budget',

12
resources/views/transactions/mass/edit.twig
View File

@@ -98,7 +98,10 @@
<!-- Source: {{ journal.source_account_name }} ({{ journal.source_account_id }}) -->
<!-- Destination: {{ journal.destination_account_name }} ({{ journal.destination_account_id }}) -->
<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 #}
{% 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 }}]">
@@ -117,9 +120,13 @@
name="source_name[{{ journal.transaction_journal_id }}]" type="text"
value="{% if journal.source_type != 'Cash account' %}{{ journal.source_account_name }}{% endif %}">
{% endif %}
{% endif %}
</td>
<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 #}
{% 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"
value="{% if journal.destination_type != 'Cash account' %}{{ journal.destination_account_name }}{% endif %}">
{% endif %}
{% endif %}
</td>
{# category #}
<td style="position: relative;">