From adef375aaf7eb1124fd8026851be60e329cfceaa Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 17 Dec 2021 16:06:20 +1100
Subject: [PATCH] v5.3.37

---
 VERSION.txt                             | 2 +-
 app/Jobs/Company/CompanyImport.php      | 1 +
 app/Services/Invoice/InvoiceService.php | 7 -------
 config/ninja.php                        | 4 ++--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 9af2414c2ca1..0c37012d2c18 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.3.36
\ No newline at end of file
+5.3.37
\ No newline at end of file
diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php
index 5f8f1d913b39..5b476f6268e3 100644
--- a/app/Jobs/Company/CompanyImport.php
+++ b/app/Jobs/Company/CompanyImport.php
@@ -896,6 +896,7 @@ class CompanyImport implements ShouldQueue
                 ['quotes' => 'quote_id'],
                 ['subscriptions' => 'subscription_id'],
                 ['recurring_invoices' => 'recurring_invoice_id'],
+                ['recurring_expenses' => 'recurring_expense_id'],
                 // ['invitations' => 'invitation_id'],
             ], 
             'activities');
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index 2057b46c5166..72119404bc6e 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -136,7 +136,6 @@ class InvoiceService
      */
     public function updateBalance($balance_adjustment, bool $is_draft = false)
     {
-        // $this->invoice = (new UpdateBalance($this->invoice, $balance_adjustment, $is_draft))->run();
 
         if ((bool)$this->invoice->is_deleted !== false) {
             nlog($this->invoice->number . " is deleted returning");
@@ -300,12 +299,6 @@ class InvoiceService
         if($this->invoice->status_id == Invoice::STATUS_DRAFT)
             return $this;
 
-        // if ((int)$this->invoice->balance == 0) {
-            
-        //     $this->setStatus(Invoice::STATUS_PAID)->workFlow();
-
-        // }
-
         if ($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) {
             $this->setStatus(Invoice::STATUS_PARTIAL);
         }
diff --git a/config/ninja.php b/config/ninja.php
index 139158bafba3..27066a5c4862 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.3.36',
-    'app_tag' => '5.3.36',
+    'app_version' => '5.3.37',
+    'app_tag' => '5.3.37',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),