diff --git a/app/Services/Template/TemplateAction.php b/app/Services/Template/TemplateAction.php
index baec76e170c9..9987a3e0306f 100644
--- a/app/Services/Template/TemplateAction.php
+++ b/app/Services/Template/TemplateAction.php
@@ -62,7 +62,7 @@ class TemplateAction implements ShouldQueue
         private string $template,
         private string $entity,
         private int $user_id,
-        private Company $company,
+        public Company $company,
         private string $db,
         private string $hash,
         private bool $send_email = false
@@ -109,9 +109,12 @@ class TemplateAction implements ShouldQueue
             $data[$key] = $result;
         }
 
-        $ts = $template_service->build($data);
         
-        // nlog($ts->getHtml());
+        $ts = $template_service
+                    ->setCompany($this->company)
+                    ->build($data);
+        
+        nlog($ts->getHtml());
 
         if($this->send_email) {
             $pdf = $ts->getPdf();
diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php
index 0528bd133246..844935ce0d5d 100644
--- a/app/Services/Template/TemplateService.php
+++ b/app/Services/Template/TemplateService.php
@@ -214,7 +214,7 @@ class TemplateService
     {
 
         $this->data = $this->preProcessDataBlocks($data);
-
+        nlog($this->data);
         return $this;
     }
 
@@ -596,7 +596,7 @@ class TemplateService
             'balance_raw' => ($payment->amount - $payment->refunded - $payment->applied),
             'date' => $this->translateDate($payment->date, $payment->client->date_format(), $payment->client->locale()),
             'method' => $payment->translatedType(),
-            'currency' => $payment->currency->code,
+            'currency' => $payment->currency->code ?? $this->company->currency()->code,
             'exchange_rate' => $payment->exchange_rate,
             'transaction_reference' => $payment->transaction_reference,
             'is_manual' => $payment->is_manual,