Index: /lib/functions.inc.php
===================================================================
--- /lib/functions.inc.php	(revision 8229)
+++ /lib/functions.inc.php	(revision 8233)
@@ -512,6 +512,6 @@
 		else
 		{
-			
-			$value = strip_tags($value);
+
+			$value = $value !== null ? strip_tags($value) : '';
 			
 		}
Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php	(revision 8229)
+++ /mods/wpsg_mod_rechnungen.class.php	(revision 8233)
@@ -823,5 +823,7 @@
 				WHERE
 					O.`id` = '".wpsg_q($order_id)."'
-			");			
+			");		
+			
+			$this->shop->view['payment'] = $this->shop->getPaymentName(@$this->shop->view['data']['type_payment'], $order_id);
 
 			if (trim($this->shop->view['data']['language']) != '') $this->shop->setTempLocale($this->shop->view['data']['language']);