Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php	(revision 6380)
+++ /mods/wpsg_mod_rechnungen.class.php	(revision 6382)
@@ -971,4 +971,6 @@
 			$rnr = preg_replace("/\%Tag\%/i", date("d"), $rnr);
 							
+			$rnr = $this->shop->replaceUniversalPlatzhalter($rnr, $order_id);
+			
 			if ($preview)
 			{
@@ -1203,4 +1205,6 @@
 				$gnr = preg_replace("/\%Tag\%/i", date("d"), $gnr);
 
+				$gnr = $this->shop->replaceUniversalPlatzhalter($gnr, $_REQUEST['edit_id']);
+				
 				if (!$bPreview)
 				{