kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 08:35:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix #10150

Browse Source
This commit is contained in:
James Cole
2025-04-20 07:56:50 +02:00
parent 5aa677c6fb
commit 05005eac32
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/list/groups.twig
View File

@@ -295,6 +295,7 @@
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li><a href="{{ route('transactions.edit', [group.id]) }}"><span
class="fa fa-fw fa-pencil"></span> {{ 'edit'|_ }}</a></li>
{% if transaction.transaction_type_type != 'Reconciliation' and transaction.transaction_type_type != 'Opening balance' and transaction.transaction_type_type != 'Liability credit' %}
<li><a href="{{ route('transactions.delete', [group.id]) }}"><span
class="fa fa-fw fa-trash"></span> {{ 'delete'|_ }}</a></li>
<li><a href="#" data-id="{{ group.id }}" class="clone-transaction"><span
@@ -305,6 +306,7 @@
<a href="{{ route('rules.create-from-journal', [transaction.transaction_journal_id]) }}"><span
class="fa fa-fw fa-random"></span> {{ 'create_rule_from_transaction'|_ }}
</a></li>
{% endif %}
</ul>
</div>
</td>
@@ -316,12 +318,14 @@
</td>
{% endif %}
<td style="{{ style|raw }}" class="hidden-xs">
{% if transaction.transaction_type_type != 'Reconciliation' and transaction.transaction_type_type != 'Opening balance' and transaction.transaction_type_type != 'Liability credit' %}
<div class="pull-right">
<input id="list_{{ transaction.transaction_journal_id }}"
value="{{ transaction.transaction_journal_id }}"
name="journals[{{ transaction.transaction_journal_id }}]"
type="checkbox" class="mass-select form-check-inline"
data-value="{{ transaction.transaction_journal_id }}"/>
{% endif %}
</div>
</td>
</tr>

9
resources/views/transactions/show.twig
View File

@@ -19,8 +19,11 @@
{# edit + delete #}
<li><a href="{{ route('transactions.edit', [transactionGroup.id]) }}"><span
class="fa fa-pencil"></span> {{ 'edit'|_ }}</a></li>
{% if groupArray.transactions[0].type != 'reconciliation' and groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'liability credit' %}
<li><a href="{{ route('transactions.delete', [transactionGroup.id]) }}"><span
class="fa fa-trash"></span> {{ 'delete'|_ }}</a></li>
{% endif %}
{% if groupArray.transactions[0].type != 'reconciliation' and groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'liability credit' %}
<li role="separator" class="divider"></li>
{# convert to different type #}
@@ -42,6 +45,7 @@
class="fa fa-exchange"></span> {{ 'convert_to_transfer'|_ }}</a></li>
{% endif %}
{# clone #}
{% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %}
<li role="separator" class="divider"></li>
@@ -50,6 +54,7 @@
<li><a href="#" class="clone-transaction-and-edit" data-id="{{ transactionGroup.id }}"><span
class="fa fa-copy"></span> {{ 'clone_and_edit'|_ }}</a></li>
{% endif %}
{% endif %}
</ul>
</div>
@@ -223,12 +228,15 @@
{# edit + delete #}
<li><a href="{{ route('transactions.edit', [transactionGroup.id]) }}"><span
class="fa fa-pencil"></span> {{ 'edit'|_ }}</a></li>
{% if groupArray.transactions[0].type != 'reconciliation' and groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'liability credit' %}
<li><a href="{{ route('transactions.delete', [transactionGroup.id]) }}"><span
class="fa fa-trash"></span> {{ 'delete'|_ }}</a></li>
{% endif %}
{% if journal.reconciled %}
<li><a class="reconcile-button" href="{{ route('transactions.unreconcile', [journal.transaction_journal_id]) }}"><span
class="fa fa-history"></span> {{ 'unreconcile'|_ }}</a></li>
{% endif %}
{% if groupArray.transactions[0].type != 'reconciliation' and groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'liability credit' %}
<li role="separator" class="divider"></li>
{# convert to different type #}
@@ -273,6 +281,7 @@
<a href="{{ route('recurring.create-from-journal', [journal.transaction_journal_id]) }}"><span
class="fa fa-fw fa-paint-brush"></span>{{ 'create_recurring_from_transaction'|_ }}
</a></li>
{% endif %}
</ul>
</div>
</div>