Index: /mods/mod_rechnungen/eInvoice.php
===================================================================
--- /mods/mod_rechnungen/eInvoice.php	(revision 8498)
+++ /mods/mod_rechnungen/eInvoice.php	(revision 8499)
@@ -101,5 +101,8 @@
 				
 				// Lieferanschrift = Rechnungsanschfitt
-				$document->setDocumentShipTo($oOrder->getShippingName(), $oOrder->getCustomer()->getNr());
+				$shipping_name = $oOrder->getShippingCompany();
+				if (trim($shipping_name) === '') $shipping_name = $oOrder->getShippingFirstName().' '.$oOrder->getShippingName();
+
+				$document->setDocumentShipTo($shipping_name, $oOrder->getCustomer()->getNr());
 				$document->setDocumentShipToAddress($oOrder->getShippingStreet(), '', '', $oOrder->getShippingZip(), $oOrder->getShippingCity(), $oOrder->getShippingCountryKuerzel());
 				$document->setDocumentSupplyChainEvent(\DateTime::createFromFormat("Ymd", $oInvoice->getDate('Ymd')));