From 4627d764e07650f725879f16860acd39b558b1fc Mon Sep 17 00:00:00 2001
From: = <turbo124@gmail.com>
Date: Wed, 30 Dec 2020 06:07:55 +1100
Subject: [PATCH 1/2] Version bump

---
 VERSION.txt      | 2 +-
 config/ninja.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 9e661130c30e..9513b3d3e531 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.0.40
\ No newline at end of file
+5.0.41
\ No newline at end of file
diff --git a/config/ninja.php b/config/ninja.php
index 0bb7e0d09f07..4229cd9d16b7 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -12,7 +12,7 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', ''),
-    'app_version' => '5.0.40',
+    'app_version' => '5.0.41',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),

From 48520746a28a87960a309c0819b390e75a3c8c0b Mon Sep 17 00:00:00 2001
From: = <turbo124@gmail.com>
Date: Wed, 30 Dec 2020 07:37:48 +1100
Subject: [PATCH 2/2] Fixes for migration

---
 app/Jobs/Util/Import.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index d8d966432b1e..44b101edd00c 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -689,6 +689,8 @@ class Import implements ShouldQueue
 
             unset($modified['id']);
                 
+            if(array_key_exists('invitations', $resource))
+            {
                 foreach($resource['invitations'] as $key => $invite)
                 {
                     $resource['invitations'][$key]['client_contact_id'] = $this->transformId('client_contacts', $invite['client_contact_id']);
@@ -699,8 +701,10 @@ class Import implements ShouldQueue
                     nlog("find a match for " . $invite['client_contact_id'] . " " .$resource['invitations'][$key]['client_contact_id']);
                 }
 
-            $modified['invitations'] = $resource['invitations'];
+                $modified['invitations'] = $resource['invitations'];
 
+            }
+            
             $invoice = $invoice_repository->save(
                 $modified,
                 InvoiceFactory::create($this->company->id, $modified['user_id'])