diff --git a/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php b/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php
index f8813f4c..f20e652f 100644
--- a/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php
+++ b/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php
@@ -314,9 +314,21 @@ class ImportExcelLogic extends AbstractControllerLogic
             $booking = Booking::where('marking', $ref)->first();
             if($booking){
                 if($docNo != "" && $docNo != "<<New>>"){
-                    $this->updateOrCreateKeyValuePair($booking, KVPKey::AUTOCOUNT_DOCNO_CREDIT_NOTE, $docNo);
-                    if($eInvoiceValidationLink){
-                        $this->updateOrCreateKeyValuePair($booking, KVPKey::AUTOCOUNT_EINVOICE_VALIDATION_LINK_CREDIT_NOTE, $eInvoiceValidationLink);
+                    $payments = $booking->transactions()->payments()->get();
+                    $processed = false;
+                    foreach ($payments as $payment) {
+                        $refundTransaction = $payment->transactions()->refunds()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->latest()->first();
+                        if($refundTransaction){
+                            $this->updateOrCreateKeyValuePair($refundTransaction, KVPKey::AUTOCOUNT_DOCNO_CREDIT_NOTE, $docNo);
+                            if($eInvoiceValidationLink){
+                                $this->updateOrCreateKeyValuePair($refundTransaction, KVPKey::AUTOCOUNT_EINVOICE_VALIDATION_LINK_CREDIT_NOTE, $eInvoiceValidationLink);
+                            }
+                            $processed = true;
+                            break;
+                        }
+                    }
+                    if(!$processed){
+                        $unprocessedDocNos[] = $docNo;
                     }
                 }
             }
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/GenerateCreditNotePdfV2Logic.php b/app/Classes/Modules/Transactions/ControllersLogic/GenerateCreditNotePdfV2Logic.php
index 22366236..b65985b0 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/GenerateCreditNotePdfV2Logic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/GenerateCreditNotePdfV2Logic.php
@@ -94,20 +94,24 @@ class GenerateCreditNotePdfV2Logic
         if($eInvoiceStarted) {
             $eInvoiceStarted = false; //reset to re-evaluate second time
 
-            $metadata = $booking->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_CREDIT_NOTE)->first();
-            if($metadata){
-                $autoCountInvoiceId = $metadata->value;
-            }
-            $metadata = $booking->attributesKVP()->where('key', KVPKey::AUTOCOUNT_EINVOICE_VALIDATION_LINK_CREDIT_NOTE)->first();
-            if($metadata){
-                $autoCountEInvoiceValidationLink = $metadata->value;
-            }
+            $kvp = KeyValuePair::where('key', KVPKey::TRANSACTION_MODEL_CLASS)->where('value', $transaction->id)->first();
+            $refundTransaction = $kvp ? $kvp->owner : null;
+            if($refundTransaction && $refundTransaction->type === TransactionType::REFUND){
+                $metadata = $refundTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_CREDIT_NOTE)->first();
+                if($metadata){
+                    $autoCountInvoiceId = $metadata->value;
+                }
+                $metadata = $refundTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_EINVOICE_VALIDATION_LINK_CREDIT_NOTE)->first();
+                if($metadata){
+                    $autoCountEInvoiceValidationLink = $metadata->value;
+                }
 
-            Log::info('AUTOCOUNT_DOCNO_CREDIT_NOTE: ' . $autoCountInvoiceId);
-            Log::info('AUTOCOUNT_EINVOICE_VALIDATION_LINK_CREDIT_NOTE: ' . $autoCountEInvoiceValidationLink);
+                Log::info('AUTOCOUNT_DOCNO_CREDIT_NOTE: ' . $autoCountInvoiceId);
+                Log::info('AUTOCOUNT_EINVOICE_VALIDATION_LINK_CREDIT_NOTE: ' . $autoCountEInvoiceValidationLink);
 
-            if($autoCountInvoiceId && $autoCountEInvoiceValidationLink){
-                $eInvoiceStarted = true;
+                if($autoCountInvoiceId && $autoCountEInvoiceValidationLink){
+                    $eInvoiceStarted = true;
+                }
             }
         }
 
diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index d5655dec..b013f9db 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -40,7 +40,7 @@ class TransactionResource extends JsonResource
 
         $eInvoice = false;
         if($booking && $this->type === TransactionType::REFUND){
-            $kvp = $booking->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_CREDIT_NOTE)->first();
+            $kvp = $this->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_CREDIT_NOTE)->first();
             if($kvp){
                 $eInvoice = true;
             }