Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php	(revision 8146)
+++ /mods/wpsg_mod_rechnungen.class.php	(revision 8147)
@@ -1030,5 +1030,5 @@
 					$discount['amount']
 				);
-				
+
 				$arVoucher = $oCalculationOrder->getVoucher();
 				if ($arVoucher !== null) {
@@ -1279,11 +1279,7 @@
 			$this->shop->view['kunde']['land'] = $this->db->fetchRow("SELECT L.* FROM `".WPSG_TBL_LAND."` AS L WHERE L.`id` = '".wpsg_q($this->shop->view['kunde']['land'])."'");
 			$this->shop->view['data']['shipping_land'] = $this->db->fetchRow("SELECT L.* FROM `".WPSG_TBL_LAND."` AS L WHERE L.`id` = '".wpsg_q(wpsg_getStr($this->shop->view['data']['shipping_land']))."'");
-
-			if (!$preview) {
-			
-				if (wpsg_checkInput($_REQUEST['wpsg_rechnungen_datum'], WPSG_SANITIZE_DATE_EN)) $this->shop->view['rDatum'] = date('Y-m-d', strtotime($_REQUEST['wpsg_rechnungen_datum']));
-				else throw \wpsg\Exception::getSanitizeException();
-
-			}
+			
+			if (wpsg_checkInput($_REQUEST['wpsg_rechnungen_datum'], WPSG_SANITIZE_DATE_EN)) $this->shop->view['rDatum'] = date('Y-m-d', strtotime($_REQUEST['wpsg_rechnungen_datum']));
+			else throw \wpsg\Exception::getSanitizeException();
 		
 			if ($this->shop->hasMod('wpsg_mod_shippingadress') && $this->shop->callMod('wpsg_mod_shippingadress', 'check_different_shippingadress', array('k_id' => @$this->shop->view['data']['k_id'], 'o_id' => @$this->shop->view['data']['id']))) {
@@ -1325,5 +1321,7 @@
 			$oCalculation = new \wpsg\wpsg_calculation();			
 			$oCalculationOrder = \wpsg\wpsg_calculation::getOrderCalculation($order_id);
-						
+					
+			$this->shop->view['oCalculationOrder'] = $oCalculationOrder;
+
 			$oCalculation->setTaxMode($oCalculationOrder->getTaxMode());
 			
@@ -1356,6 +1354,6 @@
 
 				}
-				
-				$arVoucher = $oCalculationOrder->getVoucher();
+
+				$arVoucher = $oCalculationOrder->getVoucher(); 
 				if ($arVoucher !== null) {
 					
@@ -1435,7 +1433,7 @@
 
 					$sum['weight_gesamt'] += $p['weight'];
-					
+
 					if ($oCalculationOrder->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_B2B) {
-						
+
 						$p['preis_brutto'] = $p['preis_netto'];
 						$p['mwst_value'] = 0;
@@ -1485,6 +1483,4 @@
 				
 			}
-			
-			//die(wpsg_debug($oCalculation->getCalculationArray()));
 						
 			$this->shop->view['basket'] = [