From ed948cc965990e5e2c2eed70db8657d6bca141f3 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 20 May 2016 07:51:26 +0200
Subject: [PATCH] Allow user to split unsplit journal

---
 resources/lang/en_US/firefly.php         | 10 ++++++----
 resources/views/transactions/create.twig |  2 +-
 resources/views/transactions/edit.twig   | 18 ++++++++++++++----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index adaa5586c7..6d3f31f8b0 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -644,12 +644,9 @@ return [
     'saveOnAccount'                             => 'Save on account',
     'unknown'                                   => 'Unknown',
     'daily'                                     => 'Daily',
-    'weekly'                                    => 'Weekly',
     'monthly'                                   => 'Monthly',
-    'quarterly'                                 => 'Quarterly',
-    'half-year'                                 => 'Every six months',
-    'yearly'                                    => 'Yearly',
     'profile'                                   => 'Profile',
+    'errors'                                    => 'Errors',
 
     // reports:
     'report_default'                            => 'Default financial report for :start until :end',
@@ -834,5 +831,10 @@ return [
     'split-transactions'    => 'Split transactions',
     'split-new-transaction' => 'Split a new transaction',
 
+    'do_split'              => 'Do a split',
+    'split_this_withdrawal' => 'Split this withdrawal',
+    'split_this_deposit'    => 'Split this deposit',
+    'split_this_transfer'   => 'Split this transfer',
+
 
 ];
diff --git a/resources/views/transactions/create.twig b/resources/views/transactions/create.twig
index 720d85cc84..e7ae167f65 100644
--- a/resources/views/transactions/create.twig
+++ b/resources/views/transactions/create.twig
@@ -41,7 +41,7 @@
                         <!-- FREE FORMAT DESTINATION ACCOUNT ONLY FOR EXPENSES -->
                         {{ ExpandedForm.text('destination_account_name',null, {label: trans('form.expense_account')}) }}
 
-                        <!-- SELECTABLE DESTINATION ACCOUNT ONLY FOR TRANSFERS -->
+                        <!-- SELECTABLE DESTINATION ACCOUNT ONLY FOR TRANSFERS AND DEPOSITS -->
                         {{ ExpandedForm.select('destination_account_id',assetAccounts, null, {label: trans('form.asset_destination_account')} ) }}
 
 
diff --git a/resources/views/transactions/edit.twig b/resources/views/transactions/edit.twig
index 03e8e286d3..30aae1821c 100644
--- a/resources/views/transactions/edit.twig
+++ b/resources/views/transactions/edit.twig
@@ -15,10 +15,10 @@
         {% if errors.all|length > 0 %}
         <div class="row">
             <div class="col-lg-12">
-                <h4>Errors</h4>
+                <h3 class="text-danger">{{ 'errors'|_ }}</h3>
                 <ul>
                 {% for err in errors.all %}
-                    <li>{{ err }}</li>
+                    <li class="text-danger">{{ err }}</li>
                 {% endfor %}
                 </ul>
             </div>
@@ -51,8 +51,8 @@
                             {{ ExpandedForm.text('destination_account_name',data.destination_account_name, {label: trans('form.expense_account')}) }}
                         {% endif %}
 
-                        <!-- SELECTABLE DESTINATION ACCOUNT ONLY FOR TRANSFERS -->
-                        {% if what == 'transfer' %}
+                        <!-- SELECTABLE DESTINATION ACCOUNT ONLY FOR TRANSFERS AND DEPOSITS -->
+                        {% if what == 'transfer' or what == 'deposit' %}
                             {{ ExpandedForm.select('destination_account_id',assetAccounts, data.destination_account_id, {label: trans('form.asset_destination_account')} ) }}
                         {% endif %}
 
@@ -111,6 +111,16 @@
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.optionsList('update','transaction') }}
+
+                        <div class="form-group" id="do_split_holder">
+                            <label for="ffInput_do_split" class="col-sm-4 control-label">{{ 'do_split'|_ }}</label>
+
+                            <div class="col-sm-8">
+                                <p class="form-control-static">
+                                    <a href="{{ route('split.journal.edit', journal.id) }}">{{ ('split_this_'~what)|_ }}</a>
+                                </p>
+                            </div>
+                        </div>
                     </div>
                     <div class="box-footer">
                         <button type="submit" class="pull-right btn btn-success">{{ ('update_' ~ what)|_ }}</button>