From 1f9b7faa6097c9a523b090099a57d192d1ed2af7 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 9 Jun 2017 11:52:20 +0200
Subject: [PATCH] Code for #660

---
 app/Import/ImportStorage.php                 | 20 +++++++++++---------
 app/Support/Import/CsvImportSupportTrait.php |  3 +++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/Import/ImportStorage.php b/app/Import/ImportStorage.php
index 2d5524fcec..37808b6394 100644
--- a/app/Import/ImportStorage.php
+++ b/app/Import/ImportStorage.php
@@ -361,17 +361,19 @@ class ImportStorage
 
         // create new transactions. This is something that needs a rewrite for multiple/split transactions.
         $sourceData = [
-            'account_id'             => $accounts['source']->id,
-            'transaction_journal_id' => $journal->id,
-            'description'            => null,
-            'amount'                 => bcmul($amount, '-1'),
+            'account_id'              => $accounts['source']->id,
+            'transaction_journal_id'  => $journal->id,
+            'transaction_currency_id' => $journal->transaction_currency_id,
+            'description'             => null,
+            'amount'                  => bcmul($amount, '-1'),
         ];
 
         $destinationData = [
-            'account_id'             => $accounts['destination']->id,
-            'transaction_journal_id' => $journal->id,
-            'description'            => null,
-            'amount'                 => $amount,
+            'account_id'              => $accounts['destination']->id,
+            'transaction_currency_id' => $journal->transaction_currency_id,
+            'transaction_journal_id'  => $journal->id,
+            'description'             => null,
+            'amount'                  => $amount,
         ];
 
         $one   = Transaction::create($sourceData);
@@ -383,7 +385,7 @@ class ImportStorage
         }
 
         if (is_null($two->id)) {
-            Log::error('Could not create transaction 1.', $two->getErrors()->all());
+            Log::error('Could not create transaction 2.', $two->getErrors()->all());
             $error = true;
         }
 
diff --git a/app/Support/Import/CsvImportSupportTrait.php b/app/Support/Import/CsvImportSupportTrait.php
index efee16704a..dbf915f50f 100644
--- a/app/Support/Import/CsvImportSupportTrait.php
+++ b/app/Support/Import/CsvImportSupportTrait.php
@@ -16,12 +16,15 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Import\Mapper\MapperInterface;
 use FireflyIII\Import\MapperPreProcess\PreProcessorInterface;
 use FireflyIII\Import\Specifics\SpecificInterface;
+use FireflyIII\Models\ImportJob;
 use League\Csv\Reader;
 use Log;
 
 /**
  * Trait CsvImportSupportTrait
  *
+ * @property ImportJob $job
+ *
  * @package FireflyIII\Support\Import
  */
 trait CsvImportSupportTrait