Merge branch 'release/4.7.1.2'

app/Import/Object/ImportAccount.php

@@ -382,11 +382,12 @@ class ImportAccount
         Log::debug(sprintf('Found no account of type %s so must create one ourselves.', $this->expectedType));
 
         $data = [
-            'accountType'    => config('firefly.shortNamesByFullName.' . $this->expectedType),
-            'name'           => $this->accountName['value'] ?? '(no name)',
-            'iban'           => $this->accountIban['value'] ?? null,
-            'active'         => true,
-            'virtualBalance' => '0',
+            'accountType'     => config('firefly.shortNamesByFullName.' . $this->expectedType),
+            'name'            => $this->accountName['value'] ?? '(no name)',
+            'iban'            => $this->accountIban['value'] ?? null,
+            'active'          => true,
+            'virtualBalance'  => '0',
+            'account_type_id' => null,
         ];
 
         $this->account = $this->repository->store($data);

app/Import/Storage/ImportStorage.php

@@ -57,11 +57,11 @@ class ImportStorage
     /** @var Collection */
     public $journals;
     /** @var BillRepositoryInterface */
-    protected $billRepository; // yes, hard coded
+    protected $billRepository;
     /** @var Collection */
     protected $bills;
     /** @var int */
-    protected $defaultCurrencyId = 1;
+    protected $defaultCurrencyId = 1; // yes, hard coded
     /** @var ImportJob */
     protected $job;
     /** @var ImportJobRepositoryInterface */

composer.json

@@ -113,11 +113,13 @@
 			"php artisan firefly:upgrade-database",
 			"php artisan firefly:verify",
 			"php artisan firefly:instructions update",
-			"php artisan optimize"
+			"php artisan optimize",
+			"php artisan passport:install"
 		],
 		"post-install-cmd": [
 			"php artisan optimize",
-			"php artisan firefly:instructions install"
+			"php artisan firefly:instructions install",
+			"php artisan passport:install"
 		]
 	},
 	"config": {

config/firefly.php

@@ -33,7 +33,7 @@ return [
         'is_demo_site'     => false,
     ],
     'encryption'     => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true),
-    'version'        => '4.7.1',
+    'version'        => '4.7.1.2',
     'api_version'    => '0.1',
     'maxUploadSize'  => 15242880,
     'allowedMimes'   => [