From 98612dd253a77282eafec48925d7322531f4d00b Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Tue, 2 Sep 2014 19:12:57 +0200
Subject: [PATCH] Last changes to make the import routine work.

---
 app/lib/Firefly/Queue/Import.php                     |  1 +
 .../Storage/Account/EloquentAccountRepository.php    |  1 +
 ide-helper.sh                                        | 12 ++++++------
 phpunit.xml                                          |  4 +++-
 vagrant-reload.sh                                    |  5 +++++
 5 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100755 vagrant-reload.sh

diff --git a/app/lib/Firefly/Queue/Import.php b/app/lib/Firefly/Queue/Import.php
index b363d96e49..f7b20816d9 100644
--- a/app/lib/Firefly/Queue/Import.php
+++ b/app/lib/Firefly/Queue/Import.php
@@ -291,6 +291,7 @@ class Import
 
                 break;
         }
+        $job->delete();
 
 
     }
diff --git a/app/lib/Firefly/Storage/Account/EloquentAccountRepository.php b/app/lib/Firefly/Storage/Account/EloquentAccountRepository.php
index e47b2b3341..209e71f48e 100644
--- a/app/lib/Firefly/Storage/Account/EloquentAccountRepository.php
+++ b/app/lib/Firefly/Storage/Account/EloquentAccountRepository.php
@@ -379,6 +379,7 @@ class EloquentAccountRepository implements AccountRepositoryInterface
             $transactionJournal = \App::make(
                                       'Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface'
             );
+            $transactionJournal->overruleUser($this->_user);
 
             $transactionJournal->createSimpleJournal(
                                $initial, $account, 'Initial Balance for ' . $account->name, $amount, $date
diff --git a/ide-helper.sh b/ide-helper.sh
index f74ed2d168..75fdc01c66 100755
--- a/ide-helper.sh
+++ b/ide-helper.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
-composer self-update
+#composer self-update
 composer update
-php artisan clear-compiled --env=local
-php artisan ide-helper:generate --env=local
-php artisan ide-helper:models --env=local --write
-php artisan optimize --env=local
-php artisan dump-autoload --env=local
\ No newline at end of file
+php artisan clear-compiled --env=vagrant
+php artisan ide-helper:generate --env=vagrant
+php artisan ide-helper:models --env=vagrant --write
+php artisan optimize --env=vagrant
+php artisan dump-autoload --env=vagrant
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
index e0b7cc582f..b5214fb9db 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -7,7 +7,9 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
+         verbose="true"
+         stopOnFailure="true"
+         strict="false"
          syntaxCheck="false"
 >
 
diff --git a/vagrant-reload.sh b/vagrant-reload.sh
new file mode 100755
index 0000000000..15fae7c7e6
--- /dev/null
+++ b/vagrant-reload.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+php artisan migrate:refresh --seed --env=vagrant
+rm -f ./app/storage/logs/laravel.log;
+rm -f ./app/storage/*.json
+sudo service nginx restart