From 439c02cb8bf79a168da439a5e255f3473e939deb Mon Sep 17 00:00:00 2001
From: Lars Kusch <lars@lars-kusch.de>
Date: Fri, 17 May 2024 07:59:25 +0200
Subject: [PATCH] Fixes

---
 app/Jobs/EDocument/MergeEDocument.php                 | 1 -
 app/Services/EDocument/Standards/ZugferdEDokument.php | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/Jobs/EDocument/MergeEDocument.php b/app/Jobs/EDocument/MergeEDocument.php
index 2618111fd105..b8377c0bb9d1 100644
--- a/app/Jobs/EDocument/MergeEDocument.php
+++ b/app/Jobs/EDocument/MergeEDocument.php
@@ -31,7 +31,6 @@ class MergeEDocument implements ShouldQueue
      */
     public function handle(): string
     {
-        global $mergeToPdf;
         $settings_entity = ($this->document instanceof PurchaseOrder) ? $this->document->vendor : $this->document->client;
 
         $e_document_type = strlen($settings_entity->getSetting('e_invoice_type')) > 2 ? $settings_entity->getSetting('e_invoice_type') : "XInvoice_3_0";
diff --git a/app/Services/EDocument/Standards/ZugferdEDokument.php b/app/Services/EDocument/Standards/ZugferdEDokument.php
index ce5263ebbafc..afcc3c349ce6 100644
--- a/app/Services/EDocument/Standards/ZugferdEDokument.php
+++ b/app/Services/EDocument/Standards/ZugferdEDokument.php
@@ -166,21 +166,21 @@ class ZugferdEDokument extends AbstractService
                 $taxtype = $this->getTaxType($item->tax_id);
                 if (!empty($item->tax_name1)) {
                     if ($taxtype == ZugferdDutyTaxFeeCategories::VAT_EXEMPT_FOR_EEA_INTRACOMMUNITY_SUPPLY_OF_GOODS_AND_SERVICES){
-                        $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate1, exemptionReason: ctrans('texts.intracommunity_suply'));
+                        $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate1, exemptionReason: ctrans('texts.intracommunity_tax_info'));
                     } else {
                         $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate1);
                     }
                     $this->addtoTaxMap($taxtype, $item->line_total, $item->tax_rate1);
                 } elseif (!empty($item->tax_name2)) {
                     if ($taxtype == ZugferdDutyTaxFeeCategories::VAT_EXEMPT_FOR_EEA_INTRACOMMUNITY_SUPPLY_OF_GOODS_AND_SERVICES){
-                        $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate2, exemptionReason: ctrans('texts.intracommunity_suply'));
+                        $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate2, exemptionReason: ctrans('texts.intracommunity_tax_info'));
                     } else {
                         $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate2);
                     }
                     $this->addtoTaxMap($taxtype, $item->line_total, $item->tax_rate2);
                 } elseif (!empty($item->tax_name3)) {
                     if ($taxtype == ZugferdDutyTaxFeeCategories::VAT_EXEMPT_FOR_EEA_INTRACOMMUNITY_SUPPLY_OF_GOODS_AND_SERVICES){
-                        $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate3, exemptionReason: ctrans('texts.intracommunity_suply'));
+                        $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate3, exemptionReason: ctrans('texts.intracommunity_tax_info'));
                     } else {
                         $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate3);
                     }
@@ -226,7 +226,7 @@ class ZugferdEDokument extends AbstractService
                 }
             }
             if ($item["tax_type"] == ZugferdDutyTaxFeeCategories::VAT_EXEMPT_FOR_EEA_INTRACOMMUNITY_SUPPLY_OF_GOODS_AND_SERVICES){
-                $this->xdocument->addDocumentTax($item["tax_type"], "VAT", $item["net_amount"], $item["tax_rate"] * $item["net_amount"], $item["tax_rate"] * 100, ctrans('texts.intracommunity_suply'));
+                $this->xdocument->addDocumentTax($item["tax_type"], "VAT", $item["net_amount"], $item["tax_rate"] * $item["net_amount"], $item["tax_rate"] * 100, ctrans('texts.intracommunity_tax_info'));
             } else {
             $this->xdocument->addDocumentTax($item["tax_type"], "VAT", $item["net_amount"], $item["tax_rate"] * $item["net_amount"], $item["tax_rate"] * 100);
             }