diff --git a/locale.xml b/locale.xml
index 03a0e8a1e12fdb4e3151c8f92984e893127b03e1..3c6bd2c992e7d5d750cbf54e654763cd9ff7a262 100644
--- a/locale.xml
+++ b/locale.xml
@@ -1651,6 +1651,11 @@
 
     <groups name="quiqqer/invoice" datatype="php">
 
+        <locale name="history.InvoiceTemporary.new_hash_on_post">
+            <de><![CDATA[Bei Buchung der Rechnung musste eine neue Vorgangsnummer ("Hash") generiert werden, da bereits ein anderer Rechnungs-Entwurf mit identischer Vorgangsnummer vorlag. Vorherige Vorgangsnummer: [oldHash] | Neue Vorgangsnummer: [newHash]]]></de>
+            <en><![CDATA[When posting the invoice, a new procedure number ("hash") had to be generated because another invoice draft with an identical procedure number already existed. Previous procedure number: [oldHash] | New procedure number: [newHash]]]></en>
+        </locale>
+        
         <locale name="OutputProvider.epc_qr_code_purpose">
             <de><![CDATA[Rechnung [invoiceNo]]]></de>
             <en><![CDATA[Invoice [invoiceNo]]]></en>
diff --git a/src/QUI/ERP/Accounting/Invoice/InvoiceTemporary.php b/src/QUI/ERP/Accounting/Invoice/InvoiceTemporary.php
index faf9a3727bfbc90649eb783f4a161aa048afcb72..02d7fda6e629e5273ebe10ef54f2fd9352b4edd3 100644
--- a/src/QUI/ERP/Accounting/Invoice/InvoiceTemporary.php
+++ b/src/QUI/ERP/Accounting/Invoice/InvoiceTemporary.php
@@ -1291,17 +1291,25 @@ public function post($PermissionUser = null): Invoice
 
         // check if hash already exists
         try {
-            $oldHash = $this->getAttribute('hash');
+            $oldHash          = $this->getAttribute('hash');
+            $HashCheckInvoice = Handler::getInstance()->getInvoiceByHash($oldHash);
 
-            Handler::getInstance()->getInvoiceByHash($oldHash);
+            if ($HashCheckInvoice instanceof InvoiceTemporary &&
+                $HashCheckInvoice->getCleanId() !== $this->getCleanId()) {
+                // if invoice hash exist, we need a new hash
+                $this->setAttribute('hash', QUI\Utils\Uuid::get());
 
-            // if invoice hash exist, we need a new hash
-            $this->setAttribute('hash', QUI\Utils\Uuid::get());
-            $this->getComments()->addComment(
-                'A new hash has been created. The hash already existed.'.
-                'Old Hash: '.$oldHash.
-                'New Hash: '.$this->getAttribute('hash')
-            );
+                $this->getComments()->addComment(
+                    QUI::getLocale()->get(
+                        'quiqqer/invoice',
+                        'history.InvoiceTemporary.new_hash_on_post',
+                        [
+                            'oldHash' => $oldHash,
+                            'newHash' => $this->getAttribute('hash')
+                        ]
+                    )
+                );
+            }
         } catch (QUI\Exception $Exception) {
             QUI\System\Log::writeDebugException($Exception);
         }