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

Cleanup transaction journal edit. #215

Browse Source
This commit is contained in:
James Cole
2016-03-20 17:12:34 +01:00
parent cc26ce4143
commit 201790ff8d
9 changed files with 116 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -650,7 +650,7 @@ return [
'earned' => 'Earned',
'overspent' => 'Overspent',
'left' => 'Left',
'noBudget' => '(no budget)',
'no_budget' => '(no budget)',
'maxAmount' => 'Maximum amount',
'minAmount' => 'Minumum amount',
'billEntry' => 'Current bill entry',

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

@@ -74,7 +74,6 @@ return [
'add_new_deposit' => 'Add a new deposit',
'add_new_transfer' => 'Add a new transfer',
'noPiggybank' => '(no piggy bank)',
'noBudget' => '(no budget)',
'title' => 'Title',
'notes' => 'Notes',
'filename' => 'File name',

2
resources/views/reports/default/multi-year.twig
View File

@@ -100,7 +100,7 @@
<div class="row">
<div class="col-lg-12">
<label class="checkbox-inline">
<input type="checkbox" class="budget-checkbox" name="budgets[]" value="0"> {{ 'noBudget'|_ }}
<input type="checkbox" class="budget-checkbox" name="budgets[]" value="0"> {{ 'no_budget'|_ }}
</label>
{% for budget in budgets %}
<label class="checkbox-inline">

2
resources/views/reports/partials/budgets.twig
View File

@@ -22,7 +22,7 @@
{% if budgetLine.getBudget.id %}
<a href="{{ route('budgets.show',budgetLine.getBudget.id) }}">{{ budgetLine.getBudget.name }}</a>
{% else %}
<em>{{ 'noBudget'|_ }}</em>
<em>{{ 'no_budget'|_ }}</em>
{% endif %}
</td>
<td>

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

@@ -24,7 +24,7 @@
<!-- SHOW ACCOUNT (FROM) ONLY FOR WITHDRAWALS AND DEPOSITS -->
{% if what == 'deposit' or what == 'withdrawal' %}
{{ ExpandedForm.select('account_id',accounts,data['account_id']) }}
{{ ExpandedForm.select('account_id',accountList,data['account_id']) }}
{% endif %}
<!-- SHOW EXPENSE ACCOUNT ONLY FOR WITHDRAWALS -->
@@ -39,8 +39,8 @@
<!-- ONLY SHOW FROM/TO ACCOUNT WHEN CREATING TRANSFER -->
{% if what == 'transfer' %}
{{ ExpandedForm.select('account_from_id',accounts,data['account_from_id']) }}
{{ ExpandedForm.select('account_to_id',accounts,data['account_to_id']) }}
{{ ExpandedForm.select('account_from_id',accountList,data['account_from_id']) }}
{{ ExpandedForm.select('account_to_id',accountList,data['account_to_id']) }}
{% endif %}
<!-- ALWAYS SHOW AMOUNT -->
@@ -61,7 +61,7 @@
<div class="box-body">
<!-- BUDGET ONLY WHEN CREATING A WITHDRAWAL -->
{% if what == 'withdrawal' %}
{{ ExpandedForm.select('budget_id',budgets,data['budget_id']) }}
{{ ExpandedForm.select('budget_id',budgetList,data['budget_id']) }}
{% endif %}
<!-- CATEGORY ALWAYS -->
@@ -80,8 +80,8 @@
{{ ExpandedForm.text('tags') }}
<!-- RELATE THIS TRANSFER TO A PIGGY BANK -->
{% if what == 'withdrawal' and piggies|length > 0 %}
{{ ExpandedForm.select('piggy_bank_id',piggies,data['piggy_bank_id']) }}
{% if what == 'transfer' and piggyBankList|length > 0 %}
{{ ExpandedForm.select('piggy_bank_id',piggyBankList,data['piggy_bank_id']) }}
{% endif %}
<!-- ATTACHMENTS -->