From 8764a4e4c0c53765552a55a023eb479519bd65cc Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 18 Oct 2024 10:27:45 +1100
Subject: [PATCH] minor fixeS

---
 app/Repositories/UserRepository.php | 2 +-
 app/Services/Client/Merge.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php
index d155c133bd3..0d13387fc36 100644
--- a/app/Repositories/UserRepository.php
+++ b/app/Repositories/UserRepository.php
@@ -72,7 +72,7 @@ public function save(array $data, User $user, $unset_company_user = false, $is_m
             $user->confirmation_code = $this->createDbHash($company->db);
         }
 
-        $user->account_id = $account->id;
+        $user->account_id = $account->id;//@todo we should never change the account_id if it is set at this point.
 
         if (strlen($user->password) >= 1) {
             $user->has_password = true;
diff --git a/app/Services/Client/Merge.php b/app/Services/Client/Merge.php
index eea1a21ab79..9ccc065d937 100644
--- a/app/Services/Client/Merge.php
+++ b/app/Services/Client/Merge.php
@@ -72,7 +72,7 @@ public function run()
         $this->mergable_client->forceDelete();
 
         $this->client->credit_balance = $this->client->service()->getCreditBalance();
-        $this->saveQuietly();
+        $this->client->saveQuietly();
 
         return $this->client;
     }