From ea484a77875c2d64af3949eaee4a534331c3f366 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 22 Apr 2018 12:01:18 +0200
Subject: [PATCH] Small bill related fixes.

---
 app/Http/Controllers/Transaction/SingleController.php |  9 ++++++++-
 app/Http/Controllers/Transaction/SplitController.php  |  4 ++++
 resources/views/bills/show.twig                       | 10 ----------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php
index c76a87dc9c..e9d9d95ad6 100644
--- a/app/Http/Controllers/Transaction/SingleController.php
+++ b/app/Http/Controllers/Transaction/SingleController.php
@@ -398,7 +398,14 @@ class SingleController extends Controller
         }
         // @codeCoverageIgnoreEnd
 
-        $data    = $request->getJournalData();
+        $data = $request->getJournalData();
+
+        // keep current bill:
+        $data['bill_id'] = $journal->bill_id;
+        var_dump($data);
+
+        exit;
+
         $journal = $repository->update($journal, $data);
         /** @var array $files */
         $files = $request->hasFile('attachments') ? $request->file('attachments') : null;
diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php
index 6910c9ec72..94443d2433 100644
--- a/app/Http/Controllers/Transaction/SplitController.php
+++ b/app/Http/Controllers/Transaction/SplitController.php
@@ -144,6 +144,10 @@ class SplitController extends Controller
             return $this->redirectToAccount($journal); // @codeCoverageIgnore
         }
         $data    = $request->getAll();
+
+        // keep current bill:
+        $data['bill_id'] = $journal->bill_id;
+
         $journal = $this->repository->update($journal, $data);
 
         /** @var array $files */
diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig
index 14cb9384a0..7f61c3d402 100644
--- a/resources/views/bills/show.twig
+++ b/resources/views/bills/show.twig
@@ -42,16 +42,6 @@
                                 {% endif %}
                             </td>
                         </tr>
-                        <tr>
-                            <td>{{ 'bill_will_automatch'|_ }}</td>
-                            <td>
-                                {% if object.data.automatch %}
-                                    <i class="fa fa-check fa-fw" title="{{ 'auto_match_on'|_ }}"></i> {{ 'yes'|_ }}
-                                {% else %}
-                                    <i class="fa fa-times fa-fw" title="{{ 'auto_match_off'|_ }}"></i> {{ 'no'|_ }}
-                                {% endif %}
-                            </td>
-                        </tr>
                         <tr>
                             <td>{{ 'next_expected_match'|_ }}</td>
                             <td>